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

Severe merge problem with Tortoise 1.5.x

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Fri, 05 Jun 2009 16:01:56 +0200


We have the following problem with Tortoise 1.5.x (tested 1.5.6 and 1.5.9):

We are merging a range (r57-70), which is of course not a batch merge,
but only one diff.

At the first conflict, we click on "Resolve all later". Tortoise
continues to merge, but at a certain point, it merges again the same range.

So, we end up with corrupted files.

If we do the same with Subversion 1.5.5 command line client, it works OK.

Attaching the output of the merge window, where this line occurs 2 times:

Merging r57 through r70

If this is already fixed in 1.6.x, it would not really help us, because
we cannot force all our customers to update to 1.6 now.




To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

  • application/x-zip-compressed attachment: Merge.zip
Received on 2009-06-05 16:05:47 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.