Re: Feature branch merging by trunk replacement question...

On Apr 15, 2005, at 2:22 PM, Rule, Chris wrote:

> Sorry if this seems inane, but....
>
> So how do you actually do the comparing the trunk@HEAD with
> branch@HEAD? I
> thought doing this kind of command with svn merge won't work since the
> head
> revision number in each case would be the same. Correct?
>
> As in I didn't think this would work (running while in the WC
> directory):
> svn merge trunk@HEAD branch@HEAD

Of course it will work. The merge command compares 2 URLs -- *any* two
URLs -- and then applies the the diff to a working copy. Run 'svn help
merge' and notice the different syntaxes:

    svn merge URL1@X URL2@Y working-copy
    svn merge -r X:Y URL working-copy

The latter case is used when the URLs are identical. It's a shorthand
for the more formal first syntax.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Apr 16 03:12:50 2005