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

Re: svnmerge.py for MERGE BACK !?

From: Florian Seydoux <florianseydoux_at_gmail.com>
Date: Mon, 07 Jul 2008 10:07:51 +0200

Ravi Bavanari wrote:
> Is there any way to merge back my changes by using svnmerge.py to
> development branch?
>
> i used following commands to merge my changes.
>
> svnmerge.py init /trunk
> svnmerge merge
> svn ci -F svn-message-txt
>
> now i want to merge back all changes which i did above using
> svnmerge.py, can we do using svnmerge.py!?
>

just do the same, but from a WC of trunk:

svnmerge.py init <path-to-your-branch>
svnmerge avail -b # event. -S <path-to-your-branch>
svnmerge merge -b # event. -S ...
svn ci -F svn-merge...

regards

flo

-- 
--------------------------------------------------------------------
Seydoux Florian
http://www.spinx-technologies.com
--------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-07 10:08:29 CEST

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.