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

[Giovanni Bajo]

Hernan Martinez Foffani <hernan at orgmf.com.ar> wrote:

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


Alas, no. If you think about it, it's algoritmically impossible.
-- 
Giovanni Bajo