[Svnmerge] [PATCH] Bidirectional patch take 2

[Blair Zajac]

Here's a heavily modified version of Raman's patch that is against HEAD in

http://svn.collab.net/repos/svn/trunk/contrib/client-side/

This passes the test suite on my systems.

Please run timing tests with and without the --bidirectional flags, especially 
if you are using a repository that does not do bidirectional merges.  The 
optimization in the patched svnmerge.py should show almost no speed loss.

If people cannot show a speed hit for enabling this feature by default, I'll 
plan on doing so.

Please give this a shot and and give me any feedback.  I've incorporated much of 
Giovanni's feedback already.

The new command line option is named -b or --bidirectional.

I'm heading home now and don't have time to put together a list of changes, but 
this patch should be smaller than Raman's original, since I've merged in many of 
the changes that were unrelated to the bidirectional support into svn.collab.net 
already.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: svnmerge-bi-dir-patch-2.txt
Url: /pipermail/svnmerge/attachments/20060223/dc1989a3/attachment.txt