Force merge tool to run on any change

[Andrew Lentvorski]

I'm trying to force kdiff3 to run for differences *no matter what*.  Unfortunately, something is short circuiting me.

I don't want a quiet merge.  I want to pop open kdiff3 *for even the most trivial change--even if only one of the files changed--even if its just whitespace*, and I'm absolutely pulling my hair out.  I've turned off premerge.  I've changed the args so that there is no "-auto" on the line, and I still can't get kdiff3 to pop open.

I'm sure it's something stupid, but apparently my google-fu is too low level.

Any advice or pointers as to where to look would be appreciated.

Thanks,
-a


I can run "$ hg diff -r 86" and I get a bunch of changes:

$ hg diff -r 86
diff -r a2cab1580ad1 build.sh
--- a/build.sh	Thu Oct 22 07:22:51 2015 +0000
+++ b/build.sh	Thu Oct 22 01:58:50 2015 -0700
@@ -18,7 +18,7 @@

...

diff -r a2cab1580ad1 co_shim.h
--- a/co_shim.h	Thu Oct 22 07:22:51 2015 +0000
+++ b/co_shim.h	Thu Oct 22 01:58:50 2015 -0700
@@ -79,11 +79,6 @@

...

diff -r a2cab1580ad1 test.c
--- a/test.c	Thu Oct 22 07:22:51 2015 +0000
+++ b/test.c	Thu Oct 22 01:58:50 2015 -0700
@@ -24,7 +24,7 @@


Yet when I merge:
$ hg merge -r 86
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

ARRGGGH!  No you !@#$%^ computer, I want you to pop open my tool.



My config file:
$cat ~/.hgrc
[ui]
username = Andrew Lentvorski <bsder at allcaps.org>
merge = kdiff3

[extensions]
hgext.extdiff =

[extdiff]
cmd.kdiff3 = /usr/bin/kdiff3
cmd.vdiff = /usr/bin/kdiff3

[merge-tools]
mymergetool.premerge = False
kdiff3.priority = -1
kdiff3.premerge = False
kdiff3.args = --L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.gui = True

[merge-patterns]
** = noautomerge

[merge-tools]
noautomerge.executable = kdiff3
noautomerge.args = $base $local $other -o $output --qall
noautomerge.priority = 1
noautomerge.premerge = False


$ hg --version
Mercurial Distributed SCM (version 3.1.2)
(see http://mercurial.selenic.com for more information)

$ uname -a
Linux debian-jessie 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt11-1+deb8u5 (2015-10-09) x86_64 GNU/Linux

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://selenic.com/pipermail/mercurial/attachments/20151022/70275f12/attachment.pgp>