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

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

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: 2007-10-26 23:56:57 CEST

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

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.

BTW I like the new merge wizard. Much cleaner to look at and easier to
understand. Now I just need to document it, although that should be a
lot easier because the dialogs follow a logical process.


  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 Fri Oct 26 23:57:08 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.