Bug 3347 - test-merge-types.t fails if hgmerge is found in $PATH
Summary: test-merge-types.t fails if hgmerge is found in $PATH
Status: RESOLVED FIXED
Alias: None
Product: Mercurial
Classification: Unclassified
Component: Mercurial (show other bugs)
Version: unspecified
Hardware: All All
: normal bug
Assignee: Bugzilla
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-04-02 03:43 UTC by Thomas Arendsen Hein
Modified: 2012-05-13 04:48 UTC (History)
3 users (show)

See Also:
Python Version: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Arendsen Hein 2012-04-02 03:43 UTC
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?
Comment 1 Matt Mackall 2012-04-03 08:59 UTC
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).
Comment 2 Thomas Arendsen Hein 2012-04-04 03:20 UTC
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.
Comment 3 HG Bot 2012-04-06 15:00 UTC
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)
Comment 4 Thomas Arendsen Hein 2012-04-10 02:46 UTC
test works with and without hgmerge in $PATH
Comment 5 Bugzilla 2012-05-12 09:29 UTC

--- 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