test-merge-changedelete.t fails with my hgmerge

[Bryan O'Sullivan]

On Tue, Feb 14, 2017 at 8:10 AM, timeless <timeless at gmail.com> wrote:

> Two points:
> 1. The tests afaik are supposed to be self-contained.
> 2. The error reporting here was incredibly unhelpful. I shouldn't have
> to insert dozens of debug statements to find out that `hg merge`
> called an `hgmerge` script and that the script failed. hg should tell
> me that it called `hgmerge` and that it failed.
>

A long time ago, the default external merge program that we looked for was
called hgmerge, and there's still backwards compatibility code in
filemerge.py to support it.

The tests are as self-contained as they can reasonably be, but the only
viable way to achieve this is to put a special bindir at the front of PATH.
That bindir is prepopulated with special versions of important commands,
but hgmerge isn't in that set.

The obviously easiest thing to do is delete your local hgmerge script and
move on, unless you want to insert a hgmerge command into the special
bindir – but I can almost guarantee that doing so will break other tests.
Any "more general" attempt at a fix probably won't actually help anyone
except you.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170214/fc5ae9f8/attachment.html>