[Svnmerge] Bi-directional merging becoming more painful

[Archie Cobbs]

Blair Zajac wrote:
> So I think as a community, we should decide on the dot files or the slow 
> approach.  Maybe we implement both?  Having the dot files there won't 
> prevent the slower solution from working.

How about this..

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

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com