Ralf S. Engelschall [EMAIL PROTECTED] writes:
On Sun, Sep 23, 2007, Stephen Leake wrote:
However, --show-overlap removes the 'ancestor' information from the
merged output; sometimes, that info is useful. So I think I prefer
running diff3 without --show-overlap. I'll have to try it some more.
On Mon, Sep 24, 2007, Stephen Leake wrote:
[...]
Should we add something to monotone.texi describing this? The other
merge tools are not documented at this level. I now see that the
source of std_hooks.lua is included in monotone info, and thus
available even in a binary distribution. So
On Mon, Sep 24, 2007 at 06:15:47AM -0400, Stephen Leake wrote:
The code that does this is in diff_patch.cc merge_via_edit_scripts. I
don't fully understand how it works :). Adding this feature is
probably more work that it's worth, since external diff3 with Emacs
works fine for me.
In the
On Sat, Sep 22, 2007, Stephen Leake wrote:
Stefan Monnier [EMAIL PROTECTED] 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
On Sun, Sep 23, 2007, Ralf S. Engelschall wrote:
On Sat, Sep 22, 2007, Stephen Leake wrote:
Stefan Monnier [EMAIL PROTECTED] 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
On Sun, Sep 23, 2007, Ralf S. Engelschall wrote:
On Sun, Sep 23, 2007, Ralf S. Engelschall wrote:
On Sat, Sep 22, 2007, Stephen Leake wrote:
Stefan Monnier [EMAIL PROTECTED] writes:
Bak when I used monotone for the first time, I was surprised to see that
all the merge options
Ralf S. Engelschall [EMAIL PROTECTED] writes:
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...
$
On Sun, Sep 23, 2007, Stephen Leake wrote:
Ralf S. Engelschall [EMAIL PROTECTED] writes:
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
Stefan Monnier [EMAIL PROTECTED] 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
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
10 matches
Mail list logo
