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

Re: BUG: Merge wizard changes selected revisions

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-11-20 19:43:59 CET

Lübbe Onken | RA Consulting wrote:
> 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: 3517,3497,3495,3492,3488
> 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:
> 3516-3517,3496-3497,3494-3495,3491-3492,3487-3488
> I press OK to get back to the previous page and start the actual
> merge. Suddenly the merge goes over the following revisions:
> 3515-3517,3495-3497,3493-3495,3490-3492,3486-3488
> 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.

Fixed in revision 11403.


   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 19:44:47 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.