[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problems with merge - nothing happens?

From: Ken Miller <klm_at_shetlandsoftware.com>
Date: 2004-11-10 02:01:29 CET

Walden Mathews wrote:

>| If I do this:
>|
>| svn diff $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10 $R/pos/trunk
>|
>| I see a list of differences. What I want to do is take the differences
>| from the tagged branch, and merge them with the code on the trunk
>
>There are basically two useful things you can do with merge
>and these two branches, and a working copy of the trunk:
>
>(1) you can apply changes made in the branch to your
> trunk. "svn merge -rN:M branch ."
>
>
This one is what I want to do. Change have been made to a piece of
in-production code, and my co-worker wants to migrate the changes into
the trunk of the development version.

>(2) you can make your trunk look exactly like the head of
> your branch. "svn merge trunk branch ."
>
>
I do this regularly when I'm making my fixes to various trees of code,
using the

    svn merge -r start:end REPOS-PATH WC

incantation of the merge command. Works fine for me - this is why I'm
confused about why it won't work for this current situation, which to me
seems like the same thing.

>Which one are you trying to do?
>
>Walden Mathews
>
>
Cheers!

    -klm.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 10 02:03:28 2004

This is an archived mail posted to the Subversion Users mailing list.