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

Re: Off-by-one in merge wizard (with reverse merge)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-27 10:42:25 CEST

Simon Large wrote:
> Hi Stefan,
> Back in the docs test folder again, doc/test/temp/doc, merge a
> revision out of dug_ignore.xml
> Merge wizard, range of revisions.
> Select r7 and check reverse merge
> 7 appears in the list
> Merge -> merging r8 through r7. Nothing happens.
> r8 does not exist. But there is no error message, as there would be
> from the log dialog.
> Select r6 and check reverse merge
> 6 appears in the list
> Merge -> Merging r7 through r6. Merges out the changes from r7
> I asked for r6 and it merged out r7.
> Select r7 and forward merge
> 7 appears in the list
> Merge -> Merging r6 through r7. Puts back the r7 changes.
> This is correct

Fixed in revision 11139.

> I'm not sure about the display 'r6 through r7'. I asked for a single
> revision, so a display like that would worry me. If you want to use
> the diff format it may be better to use CLI format, ie. r6:7, or just
> stick to the format used in the range-to-merge dialog.

That display is for information purposes only, and I think we really
should show 'r6 through r7' there, because without that, I would have
had a much harder time to find this bug.


   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 Sat Oct 27 10:42:34 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.