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

[Giovanni Bajo]

Blair Zajac <blair at orcaware.com> wrote:

> Sounds good.  I like the ~/.subversion/svnmerge.conf idea.  I'd also like
> it to look for an /etc/subversion/svnmerge.conf file so if you package an
> RPM or a deb, you can set it system wide.

Fine by me. Let's use a syntax identical to subversion.conf (ini file).

> But even this cache is subject to breakage if they run svnmerge.py but
> don't go through with the commit, the cache would not reflect what really
> happened.

Yes, this cache is, IMO, too fragile. Also I still don't understand how you
can store the commit number in the cache *before* the commit is actually
done.

> Maybe we should introduce an svnmerge 'commit' command to take care of any
> follow up work to do.  It would be good for consistency, as currently, we
> use svnmerge.py to do everything but the commit, which is odd for
> consistency.

And forbid "svn commit" otherwise the cache is potentially broken and all
hell break loose? No, I don't like this. I don't especially like the idea
that we introduce it only to "partially" speed up a non-default option. It'd
be pretty hard to explain to beginner users.
-- 
Giovanni Bajo