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

BUG: Merge wizard changes selected revisions

From: Lübbe Onken | RA Consulting <l.onken_at_rac.de>
Date: 2007-11-20 12:45:45 CET

Hi Folks,

The merge wizard changes the selected revisions between a dry run and the actual merge. For a merge I have selected a several revisions. The merge wizard displays the following revisions after selecting them using the log dialog:

The gaps contain a colleagues revisions that I don't want to merge.

The dry run happily goes through the revisions, merges them and all is fine. At the top of the dry-run progress window, the following revisions are displayed:

I press OK to get back to the previous page and start the actual merge. Suddenly the merge goes over the following revisions:

which causes tons of conflicts, screws my WC and I have to start over again.

There is no hint that the revisions have been changed!!!

The bug is probably triggered, because I'm merging a lot of single revisions, but this should not happen.

If I press back to get back to the revision selection, the displayed revisions are correct. Then forward again and start the merge and all is fine. It's just confirming the dry run with OK and starting the merge immediately which triggers the bug.

- Lübbe

  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Nov 20 13:06:10 2007

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.