If an executable named 'hgmerge' can be found in the directories listed in $PATH, test-merge-types.t produces a different output: --- /home/thomas/hg/repos/tah/tests/test-merge-types.t +++ /home/thomas/hg/repos/tah/tests/test-merge-types.t.err @@ -89,7 +89,7 @@ a: versions differ -> m preserving a for resolve of a updating: a 1/1 files (100.00%) - couldn't find merge tool hgmerge + tool hgmerge can't handle symlinks picked tool 'internal:prompt' for a (binary False symlink True) no tool found to merge a keep (l)ocal or take (o)ther? l ERROR: /home/thomas/hg/repos/tah/tests/test-merge-types.t output changed This happens since the added test code in: changeset: 16255:ca5cc2976574 branch: stable user: Matt Mackall <mpm@selenic.com> date: Tue Mar 13 16:28:08 2012 -0500 summary: merge: handle linear update to symlink correctly (issue3316) The line causing the output is: $ HGMERGE= hg up -y --debug What should be tested here? Automatic selection of internal:prompt?
Either output is correct, but I frankly suggest we do nothing: changeset: 6009:f077815932ce user: Matt Mackall <mpm@selenic.com> date: Sun Feb 03 19:29:05 2008 -0600 summary: filemerge: remove the hgmerge script That was a long time ago now (pre-1.0).
Since either output is correct, allowing both is an easy way. Because hgmerge was meant to be adjusted to personal needs, there may be many remaining copies in people's $PATH.
Fixed by http://selenic.com/repo/hg/rev/cb1475e7e5a2 Thomas Arendsen Hein <thomas@intevation.de> test-merge-types: allow different output with existing hgmerge (issue3346) (please test the fix)
test works with and without hgmerge in $PATH
--- Bug imported by bugzilla@serpentine.com 2012-05-12 09:29 EDT --- This bug was previously known as _bug_ 3346 at http://mercurial.selenic.com/bts/issue3346