You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by shravana kumar <sh...@yahoo.com> on 2009/03/18 14:35:56 UTC
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&dsMessageId=1348804
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: svn merge
Posted by shravana kumar <sh...@yahoo.com>.
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 <st...@barco.com> wrote:
> From: Deltour, Stephane <st...@barco.com>
> Subject: RE: svn merge
> To: "shravana kumar" <sh...@yahoo.com>
> Cc: users@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@revisionX>
> <branch1
> url@revisionY> <working copy of branch2>
>
> Regards,
> Stephane Deltour
>
> -----Original Message-----
> From: shravana kumar [mailto:shravanakumar@yahoo.com]
>
> Sent: mrt 18, 2009 15:36
> To: users@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@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@subversion.tigris.org].
Re: SVN client for z/OS
Posted by David Weintraub <qa...@gmail.com>.
I don't know of any Z/OS clients, but I did find this about compiling
from source code: <http://markmail.org/message/twm7io6xkoaieij5>
Maybe that will help.
I've never seen Z/OS binaries for Subversion, but apparently there is
a bit of demand for help in order to compile it for Z/OS.
On Tue, Mar 24, 2009 at 7:27 AM, Geir Engebakken
<ge...@edb.com> wrote:
> We are looking into using SVN as a SCM for our datasets stored on an IBM mainframe with zOS/TSO. Are there any SVN Clients available for this platform? Or are there any best-practice/experience available?
>
> We have run a small system synchronizing between a windows scm and zOs by means of scripts and ftp but this solution has proven unreliable, so we are thinking of expanding the horizon a bit.
>
>
> Geir
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1400853
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
>
--
--
David Weintraub
qazwart@gmail.com
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1403041
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
SVN client for z/OS
Posted by Geir Engebakken <ge...@edb.com>.
We are looking into using SVN as a SCM for our datasets stored on an IBM mainframe with zOS/TSO. Are there any SVN Clients available for this platform? Or are there any best-practice/experience available?
We have run a small system synchronizing between a windows scm and zOs by means of scripts and ftp but this solution has proven unreliable, so we are thinking of expanding the horizon a bit.
Geir
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1400853
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: svn merge
Posted by "Deltour, Stephane" <st...@barco.com>.
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@revisionX> <branch1
url@revisionY> <working copy of branch2>
Regards,
Stephane Deltour
-----Original Message-----
From: shravana kumar [mailto:shravanakumar@yahoo.com]
Sent: mrt 18, 2009 15:36
To: users@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@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=1354602
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].