Failing test-merge-tools
Dirkjan Ochtman
dirkjan at ochtman.nl
Tue Feb 10 09:49:30 CST 2009
On Tue, Feb 10, 2009 at 16:09, Mads Kiilerich <mads at kiilerich.com> wrote:
> Ok, I can reproduce it. It is hanging in an interactive merge started from
> hgmerge. Can you confirm that these machines have a hgmerge in the path?
On my machine, yes. Not sure about the slave.
> AFAIK it has "always" been hardcoded that Mercurial searches for hgmerge as
> last resort before falling back to the final last resort of using
> internalmerge.
>
> Matt, would it be OK to add an option to disable that?
>
> Or should the test set up a PATH where we are sure there is no hgmerge?
Can't we just use hg merge -y or whatever? There are probably other
merge tests that do this correctly, right?
Cheers,
Dirkjan
More information about the Mercurial-devel
mailing list