Thanks for that help.
I have tried the command that you said below.
It takes long time and doing nothing.
More over, I guess revisionX is not mandatory. The revision defaults to HEAD if omitted.
Thanks & Regards,
Shravana Kumar
--- On Thu, 3/19/09, Deltour, Stephane <stephane.deltour_at_barco.com> wrote:
> From: Deltour, Stephane <stephane.deltour_at_barco.com>
> Subject: RE: svn merge
> To: "shravana kumar" <shravanakumar_at_yahoo.com>
> Cc: users_at_subversion.tigris.org
> Date: Thursday, March 19, 2009, 3:31 PM
> Hi,
>
> 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
> http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge.advance
> 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>
>
> Regards,
> 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
>
> etc
>
> 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
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
> d=1348804
>
> To unsubscribe from this discussion, e-mail:
> [users-unsubscribe_at_subversion.tigris.org].
>
>
>
> DISCLAIMER:
> 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.
>
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1354859
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-19 15:27:24 CET