[Svnmerge] newbie question... from branch to trunk

Hernán Martínez Foffani hernan.martinez at ecc.es
Thu Apr 6 10:23:29 PDT 2006


>> I've started to play with svnmerge.py following the
>> simplest svnmerge.py procedure.(*)  Works wonderful
>> thanks!
>> 
>> Now, I find myself a bit confused when merging back
>> to trunk.  When using the 3way-diff merge procedure
>>   svn merge http://..etc./trunk http://.etc../branch/featureX
> 
> Can you explain the merge you're trying to do here?  The command
> you're trying is off here.  What directory are you sitting in?

Oh.. Don't mind now.

I've already found the -S and -b merge options and
svnmerge.py init on trunk.

Thanks anyway.

-Hernan




More information about the Svnmerge mailing list