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

Little problem with compare files from merge dialog

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2007-04-04 14:51:22 CEST

Hi Folks,

I think I have stumbled upon something which may be considered a
misbehaviour or bug. It happens when you intend to merge a complete branch
back into trunk and want to compare the changed files first.

Steps to reproduce:
1) Fire up the merge dialog and select the tortoisesvn 1.4.x branch in the
from url
2) Select the revision in which the branch was created as the start revision
(Use Show log, uncheck 'stop on copy', show all revisions, the first
revision is 7193). This will enter 7192 into the from revision field.
3) Select HEAD as the end revision.
4) Click on compare, wait for the file list to fill and double click on a
file. You will see the attached error message, because obviously the 1.4.x
branch doesn't exist yet in r7192.
5) If you set the from revision in the 'changed files' dialog to 7193, the
comparison will work

The reason for this behaviour is that the branch really was created in
r7193, but for the purpose of merge comfort, TortoiseSVN automatically
subtracts 1 from the value selected in the log dialog. (Or does it use the
copyfrom url & revision?)

Would it make sense to:
a) initialize the 'from' revision in the changed files dialog with 'from+1'
from the merge dialog?
b) impose a lower bound on the 'from' revision in the changed files dialog
which is set 'from+1' from the merge dialog?
c) if the revision (selected from the log|entered in the field directly) has
a copyfrom url & revision to use these values as the from url & revision for
merge & changed files?

It's just not intuitive that tortoiseSVN itself suggest a value (7192) that
it cannot handle.

- 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 Wed Apr 4 14:51:39 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.