[TSVN] Re: TSVN Merge issue vs. "Feature Branches" in SVN book

I wrote:
> svn merge trunk@HEAD feature_branch@HEAD trunk_wc
> (ignore my dodgy syntax)
> - WC = trunk
> - Merge
> From: Trunk @ HEAD
> To : feature_branch @ HEAD
>
> This example (or one close to it) is given in the SVN book; it then
> goes on to say that it will probably not do what you want it to, but
> it then doesn't give an example of why you might want to use it.

Apologies, there is an example in the book at the end of the page here:
http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.1

$ cd trunk-working-copy

$ svn update
At revision 1910.

$ svn merge http://svn.example.com/repos/calc/mybranch@1910 \
            http://svn.example.com/repos/calc/trunk@1910 \
U real.c
U integer.c
A newdirectory
A newdirectory/newfile

But it is described as a special case.

The temptation with TSVN is to use the equivalent to:

$ svn merge http://svn.example.com/repos/calc/mybranch@HEAD \
            http://svn.example.com/repos/calc/trunk@HEAD \

If someone else makes a commit to trunk between the update and the
merge, those changes will be discarded from the merge. So it is still a
command to use with care.

In this case what we want to do is take the WC rev rather than HEAD. Is
there a shorthand for that in SVN?

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 13 17:37:32 2005