[Svnmerge] Bi-directional merging becoming more painful

[Raman Gupta]

Blair Zajac wrote:
> Archie Cobbs wrote:
> 
>> The same code would be used to (a) create the dot file initially
>> (to initialize a branch for the "fast" approach) and (b) regenerate
>> the dotfile information (when doing the "slow" approach).
>>
>> So supporting both use cases shouldn't be very much extra work.
>>
>> So then svnmerge could have a new command to intialize the dot file.
>> This would be done once on an existing svnmerge branch; for newly
>> initialize svnmerge branches, it would be created automatically
>> when doing "svnmerge init".
>>
>> Thereafter, "svnmerge merge" would use the dot file if it exists
>> ("fast"), or not use it if it doesn't exist ("slow").
> 
> Sounds good.  Now somebody just needs to code it :)
> 
> I like the idea that this will work with older versions of svnmerge that
> didn't create the dot file.

+1

Unfortunately, I doubt my earlier patch for the dot-file implementation
will help much because I think the main work here is the code to
generate the merge-point revisions.

However, there are a couple of useful lines in my patch that read/write
the dot files using regexes that may come in handy (for the "fast"
approach). Of course, there may be a more "pythony" way of doing it...

Cheers,
Raman