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

Re: Merge result inconsistency

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 10 Jun 2009 18:01:53 +0200

Chuck Holzwarth wrote:
> Tortoise 1.6.2
> The symptom is:
> BranchA - working copy in a directory as a clean checkout.
> BranchB being merged on to working copy.
> Select a range of revisions for the merge and accept the default merge type.
> Conflicts arise during the merge and are resolved.
>
> New clean checkout of BranchA in a different directory.
> Merge BranchB except this time, select the revisions one at a time beginning with the oldest.
> All merges succeed with no conflicts.
>
> Using a directory compare program, compare the two working copies. The contents are different for some files.
>
> Is the merge algorithm different for range merges than for individual revision merges?

If you specify a revision range for merging, svn will calculate the diff
of that whole range and then apply that diff to your working copy in one
step if possible. If the revision range is not consequitive or you
specify multiple ranges, it will apply several diffs of course, one for
each consequitive range.

But maybe you didn't specify the exact same revisions individually than
you did when specifying the revision range?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2360978
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-10 18:02:07 CEST

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