[TSVN] Re: Re: Merge dialog, second attempt

SteveKing wrote:
>> 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.
>
> What's confusing about that? I mean, if you show a unified diff for a
> single revision, then TSVN shows you the changes you've made _in that
> revision_. If you select two revisions, then TSVN shows you the
> differences _between_ those revisions.
> I think that's not confusing at all?

No it's not confusing. If you select revisions N and M then you get
diff -rM:N

If you select just rev N you get
diff -r(N-1):N

It makes perfect sense, but it _is_ an automatic -1, and any
inconsistency would make it difficult to select a range of revisions for
merging. Think about this:

123 Change foo
122 Edit bar
120 Added to project

If I do a show-log and select 123 and 122 for unified diff I get the
diff between those 2 revs, so just the changes committed in r123.

If I do a show-log, select 123 and 122 as a merge range, do I apply a
diff between those 2 just like I get with unified diff, or do I merge
the changes from both revisions, which is what looks natural, but is
inconsistent with the unified diff output for the same selection.
_That's_ why I now think it would be the wrong way to go.

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