Hello,
I am going in trouble with merge operation wrt the way I work.
Let me explain the process.
I have the usual repo layout: trunk, branches, labels.
When I want to label a release I use TSVN branch/tag menu to copy
(tipically from the wc of the trunk) in
labels/<rls>
then I go on with the trunk.
At some point (found a bug while working on trunk) I need to branch at an old
release, say 1.0, to produce a bug fix release, so I:
1. check out labels/1.0
2. branch/tag from the wc of labels/1.0 to branches/1.0
3. switch the wc of labels/1.0 to branches/1.0
Now I would "import" the fix committed in the trunk into the wc of (now)
branches/1.0.
With TortoiseMerge there is no way to select repository urls, I should checkout
the trunk and labels/1.0 too.
With merge option in TSVN I have to select the trunk url in "Merge current branch with:",
set the revision obtained at step 2. in "From Revision" and use "Head Revision".
The problem is that once you select the trunk url, the Find button shows the Log in the
trunk path. I cannot see revision obtained at step 2.
Am I doing something wrong ?
Thanks in advance,
Guido.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 1 10:42:00 2004