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

Re: Severe merge problem with Tortoise 1.5.x

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 05 Jun 2009 19:02:45 +0200

Thomas Börkel wrote:
> HI!
> 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.

Just fixed this in r16526.

But why would you need to force your *customers* to update to 1.6?


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-05 19:03:23 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.