[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: Ravi Bavanari <ravi.bavanari_at_gmail.com>
Date: Mon, 7 Jul 2008 15:30:12 -0700

Hi Flo,

Thank you very much, i got one more doubt with svnmerge.py.

Iam using this command from blocking some revisions from merging.

 svnmerge block -r23454 -S mybranch

after to this is there is any way to un do above , blocking some revisions ?
or can we still merge those revisions my specifying explicitly...? like
svnmerge merge -r23454 -S mybranch.

Thanks ,
Ravi Bavanari

On Mon, Jul 7, 2008 at 1:07 AM, Florian Seydoux <florianseydoux_at_gmail.com>
wrote:

> 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-08 00:30:39 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.