[Svnmerge] [PATCH] Bidirectional merging patch for svnmerge.py

[Blair Zajac]

Raman Gupta wrote:
> Giovanni Bajo wrote:
> 
>>I appreciate that it's disabled by default, but it's still very slow in my
>>opinion. I think you can achieve a much better speed if you add "--verbose" to
>>the single "svn log" invokation done in analyze_revs. Does it make sense to
>>you?
> 
> 
> No, unfortunately log --verbose does not print the diffs for the
> integrated property, which is necessary in order to determine whether or
> not the revision is reflected. That information can only be obtained via
> "diff".

Raman,

This is great!  Just tried it out in our complicated project and it worked fine.

For an optimization, can't you use the --verbose option to at least see if the 
directory containing the integrated property was changed?  You will get an line like

M /project/trunk

that you could match on, making sure to use a $ in a regex.  Revisions not 
matching this don't need to have the diff done on them.

Some other nits.  Could we change the option to be 'bidir', not 'bidi', as it's 
not clear what 'bidi' stands for.

Also, the patch has some extra whitespace changes that don't need to be committed.

Regards,
Blair

-- 
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/