[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: TSVN merge report inconsistent to svn merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 10 Jul 2008 18:39:32 +0200

John Williams wrote:

> When I perform a tracked merge using the wizard in TSVN the "Merge -
> TortoiseSVN Finished!" dialog box displays some results. The merge range
> displayed in that box is inconsistent with the command line client when
> performing the exact same merge.
>
> TSVN merge with empty range box, the output is:
>
> Command Merging revisions 1-HEAD of
> file:///D:/svn/test15/branches/1.x into D:\docs-john\Dev\test15-trunk,
> respecting ancestry
> Merging r4 through r6 D:\docs-john\Dev\test15-trunk
> ...snip
>
> If I revert the merge then perform the same merge with the command line
> I see the following:
>
> \docs-john\Dev\test15-trunk>svn merge file:///D:/svn/test15/branches/1.x
> --- Merging r5 through r6 into '.':
> ...snip
>
> The difference here is that TSVN says "r4 through r6", while SVN says
> "r5 through r6". I appreciate that r6 is a changeset of r5:6. I'm not
> questioning the merge, just the report is inconsistent and possibly
> misleading.

So the merge result is actually the same?
I'm just asking because the output can be different if you used the same
repository (even if you reverted the first merge) due to the fact that
the repository stores some merge info too, and in the second merge it
could have already known that r4 didn't need merging.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-07-10 18:40:17 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.