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

[Blair Zajac]

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

Yes, we'll need to loop over the svn log output instead of doing a findall, so 
we know which revision we're on.

I'll work on this this week and hopefully have a revision of your patch in 
several days.

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

Well, I like to think of myself as pretty computer literate, but have never 
heard that slang :)

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

Don't worry about it, I've already cleaned it up in my working copy.

I'll send a revised patch out naming the option bi-dir and with the svn log -v 
performance option.

> Thanks for taking a look and providing your input.

Thank you for putting this together!  We really needed it was I was just going 
to start working on it myself.

Regards,
Blair