Re: [Monotone-devel] Non-modal merge

[Ralf S. Engelschall]

On Sun, Sep 23, 2007, Ralf S. Engelschall wrote:

> On Sat, Sep 22, 2007, Stephen Leake wrote:
>
> > Stefan Monnier <address@hidden> writes:
> >
> > > Bak when I used monotone for the first time, I was surprised to see that
> > > all the merge options provided were pretty much modal.  So I came up with
> > > the code attached below (not on my own, it's largely copied from random
> > > bits on the Web, it's probably hideous for Lua experts).
> > >
> > > Is there such a tool in standard now?
> >
> > Not in standard, but I put one in
> > contrib/diff3_keep_conflicts_merger.lua
> >
> > The objection is that this allows conflicts to be commited to the
> > database.
> >
> > In most situations, I don't have a problem with that, and I definitely
> > prefer the non-modal behavior; often I don't have time to fix all
> > the conflicts immediately.
> >
> > If you don't want the conflicts committed, you can use
> > merge_into_workspace, although that has other problems. For one thing,
> > it's undocumented :). For another, it leaves the workspace with two
> > parents, which is not typical, and Emacs DVC can't handle it (yet).
>
> I've now improved my "diffutils" merger implementation in std_hook.lua.
> One now can use MTN_MERGE_DIFFUTILS=partial to get the results
> of contrib/diff3_keep_conflicts_merger.lua. When combined with
> "merge_into_workspace" as in...
>
> $ MTN_MERGE=diffutils_new MTN_MERGE_DIFFUTILS=partial mtn merge_into_workspace

Sorry, just remove the "_new" above. This was a copy & paste
error from my session during development. "MTN_MERGE=diffutils
MTN_MERGE_DIFFUTILS=partial" does the trick on h:n.v.m now.

                                       Ralf S. Engelschall
                                       address@hidden
                                       www.engelschall.com