[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: Lübbe Onken <l.onken_at_rac.de>
Date: 2005-01-25 16:18:00 CET

The (W|B)ills wrote:

Quoting Bill:
> Back to the point, an explanation of _why_ you have to
> specify the revision
> before the one you think you want would be a good idea, might
> help keep the
> queries down too.
>
> (of course it could be configurable but I don't think we
> should go there...)
A checkbox like:

(x) "do the -1 magic for me"

would be very convenient and a great step to a high score in the GUI hall of
shame :-)

Quoting Will here:
> * In the From Revision field enter the initial revision number. This is

> the revision before the changes you want to merge. Revision numbers are
> auto-incremented after each commit. You want to start merging the changes
> before the revision number is auto-incremented. For example, if your log
> messages look something like this:
The quote is out of context here, but do we *really* explain which commit
causes the revision number to increase?

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

Cheers
-Lübbe

---------------------------------------------------------------------
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:18:51 2005

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