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

[Hernan Martinez Foffani]

> > 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?
>
> You should use svnmerge to merge back. You can run "svnmerge init" on the
> trunk multiple times, one for each branch you have. When you then run the
> avail/merge commands, you can use -S to disambiguate which branch you're
> referring to.

I see.  Thanks.

After trying it...
It's in a "loop" right now.
Alternatively in either trunk or the branch svnmerge.py avail shows one missing
revision that corresponds to the property diff.
Any way to ignore it?

-H.