[Svnmerge] Multi-directional merges with multiple branches

Madan U Sreenivasan madan at collab.net
Mon Oct 30 20:10:56 PST 2006


On Thu, 26 Oct 2006 18:52:22 +0530, Steven Shanks <sshanks at valleyt.co.uk>  
wrote:

> If I block this revision (105) in branchA, then svnmerge.py will
> recognise that this was a bi-directional block, and the problem will
> disappear, but I have now had to block several revisions after
> committing one.  If it became necessary to add a third or fourth branch
> to this setup, then the problem only increases.
> Does anyone have any suggestions on how I might avoid this problem, or
> ways I could change my setup to minimise it?
> Thanks for any help, and apologies for the length of this post!

Right now, no. (Of course, you do know that you could use a revision range  
instead of individual revision in the 'block' subcommand, right?) But I  
would be interested in knowing how you would like this problem to be  
solved.

Regards,
Madan.




More information about the Svnmerge mailing list