Failing test-merge-tools

Mads Kiilerich mads at kiilerich.com
Tue Feb 10 15:58:44 CST 2009


Matt Mackall wrote, On 02/10/2009 10:41 PM:
> Can we put our own hgmerge script earlier in the path?
>   

Sure. And we could/should do that to test that it finds hgmerge. But the 
test tested that it falled back to internal merge when no hgmerge was found.

We could also drop that part of the test.

> We can also temporarily clear the path for testing whether
> internal:merge works when -no- tools can be found.
>   

I sent the patch before seeing your mail, but it does that. Ok?

/Mads
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3435 bytes
Desc: S/MIME Cryptographic Signature
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20090210/d76ccf1e/attachment.bin 


More information about the Mercurial-devel mailing list