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

[Blair Zajac]

Hernán Martínez Foffani wrote:
> 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?

To merge from the branch back to the trunk, if its a long lived branch, you can 
set trunk up with svnmerge init to receive merged from the branch.

> I reverted the change corresponding to the property
> svnmerge-integrated before commiting the merge because
> wouldn't be propagated to other branches and conflict
> with their own property?

I don't revert those changes.  I don't have a problem with multiple sources of 
merges in one location.

> 
> http://www.sipfoundry.org/tools/svnmerge.html mentions
> the -L command option but it doesn't show up in
> svnmerge.py help init.

That page describes the Bourne shell version of svnmerge.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/