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

Merge result inconsistency

From: Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>
Date: Tue, 9 Jun 2009 11:29:03 -0700 (PDT)

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?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2360709

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-06-09 20:29:34 CEST

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