2005/8/26, Klaus Drechsler <drechsler@gmx.net>:
> I have a branch starting at rX and I want to merge it to the trunk. So
> intuitivly I want to say "merge the branch starting at rX to HEAD with my
> trunk".
> The tasks I have to think about:
> 1. I want to merge the branch to the trunk
> 2. My branch starts at r38, so I select it
Hmm, why not just enter the revision number that you already know into
that field? There is no need to "select" a revision from the log
dialog.
> 4. select HEAD
> Right now it is like this:
> 1. I want to merge the branch to the trunk
> 2. My branch starts at 38
which means that changeset 38 created the branch
> 3. I must select r39, because TSVN decrements the revision by one
You select changeset 39, because that is the first change that
happened on the branch.
> 4. select HEAD
I think the major misconception here is that you need to enter
*revision* numbers in the merge dialog, but the log dialog actually
displays *changeset* numbers. These are not the same!
Maybe the log dialog should be changed that the revision comlumn would
be named "Changeset"?
When you select a single changeset or a range of changesets from the
log dialog, then TSVN automatically converts them into the revision
range you need to pass to the merge command to merge the selected
changesets.
In my opinion, the TSVN merge dialog works exactly the same way as the
command line client. When you would svn merge -R 38:HEAD with the
command line client, you enter 38 and select HEAD for the fields in
the merge dialog.
Even if you selected changeset 38 (branch creation) for the merge and
TSVN filled the from revision with the number 37, this would be
perfectly fine. Because sometimes you WANT to merge the branch
creation into your trunk (note that you can create a branch from a
modified working copy, and you want to merge these changes to your
trunk as well).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Aug 27 10:17:28 2005