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

[Raman Gupta]

Blair Zajac wrote:
> 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.

Good to hear!

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

Hmm, yup, good idea. The regular expression may get a little involved
though because we'll have to find that line after the start of a
revision but before the next revision in the log... however, maybe I'm
over complicating it -- I'll take a look at this when I get a chance,
though it may not be until next week.

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

:-) Bidi is pretty common slang for bidirectional, though its usually
used in reference to text (search on WikiPedia). Plus its just a cool
word :-)  However, I don't mind changing it if the consensus (or the
only person with commit access) believes that bidir would be better.

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

Hmm, thought I'd gotten rid of all those. I'll fix it.

> Regards, Blair

Thanks for taking a look and providing your input.

Cheers,
Raman