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

[TSVN] Re: Merge dialog, second attempt

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2005-01-25 16:52:50 CET

Lübbe Onken wrote:
> The quote is out of context here, but do we *really* explain which
> commit causes the revision number to increase?

This is not about pre-increment and post-increment. I think we need to
explain it in the same terms that SVN does, which is that you are
creating a diff between revisions. In order to generate the diff you
have to compare with an older revision. The fact that TSVN sometimes
does the -1 for adds to the confusion.

> How about this:
> We created the branch when trunk was in revision 36. This causes the
> copy operation (create branch) to create revision 37. So revision 37
> is pointing to the branch you just created and revision 36 is
> pointing to trunk on which work is continuing (r38, r39, ..., r50).

A revision doesn't point to anything. The branch exists in r37 and
later.

> If you now want to merge your trunk changes into branch, you have to
> select 36 as the from revision, because that's the point in time when
> the development was split into trunk and branch. If you want to merge
> everything up to revision 50, the range you have to enter is 36-50.

Trunk is the same in r37 as it is in r36, so it makes no difference
whether you compare with r36 or r37.

The docs do still need clarifying, but I was waiting to see if there are
any more UI changes first ;-)

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
Received on Tue Jan 25 16:55:27 2005

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