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

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

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-25 19:22:21 CET

Simon Large wrote:

> 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.

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?

Stefan

-- 
        ___
   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
Received on Tue Jan 25 19:37:33 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.