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

[Hernán Martínez Foffani]

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
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?

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

What's the best practice for this?

Thanks and regards,
-Hernán.

(*) creating a branch.

  D:> svn cp http://..etc../trunk http://..etc../branches/featureX
  D:> svn co http://..etc../branches/featureX featureX
  D:> cd featureX
  D:> svnmerge.py init
  D:> svn commit -F svnmerge-commit-message.txt

later, after developers applied commits in trunk and
branches

  D:> svnmerge.py avail
  2200-2210
  D:> svnmerge.py merge
  U file1
  U file2
  ...etc...
  D:> svn commit -F svnmerge-commit-message.txt