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

Problems with merge - nothing happens?

From: Ken Miller <klm_at_shetlandsoftware.com>
Date: 2004-11-09 23:25:54 CET

I've merged changes across parts of the Subversion tree before, but for
some reason, I'm having a problem performing a merge.

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 (yes,
I realize that the 'tag' name is mistake - this was done by a co-worker).

Now, the 'tag' was created at version 3875 (as shown by svn log
--stop-on-copy ...), so I thought i should be able to do this:

    svn merge $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10@3875 $R/pos/trunk .

where '.' is the most up to date version (3878), ie, it matches
$R/pos/trunk. No merges are performed.

What am I doing wrong? I also tried:

    svn merge -r 3875:head $R/pos/tags/pos.AUTH_RETALIX_R1_2_P10 .

(the third form of the merge), and I also got nothing.

Can someone help me out here?

Many thanks.

    -klm.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 9 23:26:43 2004

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