[TSVN] Re: Merge dialog, second attempt

Will Dean wrote:
> I daresay there is a reasonable explanation in the SVN design history
> of why this is so (can anybody point me at this?), and I'm aware we
> can't change it now anyway. But I don't think that saying there's
> 'nothing illogical' about it is completely fair.

The explanation is in the SVN book. Merge is closely related to diff, so
to get the changes in rev 123 you have to diff 123 against 122. What
makes it more confusing is that TSVN _sometimes_ does this for you. eg.
do show-log for a file:

123 Change foo
122 Edit bar
120 Added to project

If you select rev 123 you can get a unified diff corresponding to the
changes in that rev. If you select revs 122 and 123 you get a unified
diff corresponding to the changes between 122 and 123 ... which is
exactly the same. For the single rev case _only_, TSVN is doing the -1
bit for you, because diffing a rev against itself gives an empty diff.

I like the idea of being able to select the revs to merge from show-log,
but it is equally non-obvious how to do this without making the
confusion worse.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org