Mercurial > hg
diff tests/test-merge-tools.out @ 7732:3793802ea41b
Make util.find_exe alway returns existing file, fixing issue1459
It seems like the old behaviour with different handling for commands with and
without path was intended, but I think this behaviour of util.find_exe is
better:
* Always returns existing file
* or None if command not found - no default
* Windows: Returned file thus always ends with extension from PATHEXT
This fixes http://www.selenic.com/mercurial/bts/issue1459. The change might
fix other unintended behaviour too.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 25 Jan 2009 21:20:13 +0100 |
| parents | 737f274d1915 |
| children | 8c06d4bf2c23 |
line wrap: on
line diff
--- a/tests/test-merge-tools.out Sun Jan 25 21:20:11 2009 +0100 +++ b/tests/test-merge-tools.out Sun Jan 25 21:20:13 2009 +0100 @@ -117,7 +117,6 @@ true.priority=1 # hg update -C 1 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool -sh: /bin/nonexistingmergetool: No such file or directory merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved @@ -224,7 +223,7 @@ true.executable=cat # hg update -C 1 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool -sh: /bin/nonexistingmergetool: No such file or directory +couldn't find merge tool true specified for f merging f merging f failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved