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

RE: svn merge

From: Deltour, Stephane <stephane.deltour_at_barco.com>
Date: Thu, 19 Mar 2009 11:01:46 +0100


I see two things that might cause it to go wrong.

1. If you are merging unrelated branches, it is branches that don't have
any common ancester you probably should use the --ignore-ancestry
option. See
d.ancestry for more details.

2. The command seems you are using seems wrong as well. I would expect
following syntax:
        svn merge sourceURL1[@N] sourceURL2[@M] [WCPATH]

where sourceURL is branch1 and WCPATH is branch2.

This would then be:
svn merge --ignore-ancestry <branch1 url_at_revisionX> <branch1
url_at_revisionY> <working copy of branch2>

Stephane Deltour

-----Original Message-----
From: shravana kumar [mailto:shravanakumar_at_yahoo.com]
Sent: mrt 18, 2009 15:36
To: users_at_subversion.tigris.org
Subject: svn merge

Hi All,

I have branch1 and branch2. branch2 is not derived from branch1.

Is it possible to merge branch1 changes to branch2?

If i do merge from branch1 to branch 2, every thing is getting replaced
in branch2 instead of merging.

svn status
R 1.c
R 2.c
R 3.c


what is getting wrong ?

Here is the command that i am using.

svn merge <branch1 url> <branch2 url> <working copy of branch2>

Thanks for your help

Thanks & Regards,
Shravana Kumar


To unsubscribe from this discussion, e-mail:

Unless indicated otherwise, the information contained in this message is privileged and confidential, and is intended only for the use of the addressee(s) named above and others who have been specifically authorized to receive it. If you are not the intended recipient, you are hereby notified that any dissemination, distribution or copying of this message and/or attachments is strictly prohibited. The company accepts no liability for any damage caused by any virus transmitted by this email. Furthermore, the company does not warrant a proper and complete transmission of this information, nor does it accept liability for any delays. If you have received this message in error, please contact the sender and delete the message. Thank you.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-19 11:02:52 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.