Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge-tool: Make sure no hgmerge can be found in $PATH
authorMads Kiilerich <mads@kiilerich.com>
Tue, 10 Feb 2009 22:47:38 +0100
changeset 7785 660c8dd44060
parent 7784 8a217626bb0c
child 7786 92455c1d6f83
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.
tests/run-tests.py file | annotate | diff | comparison | revisions
tests/test-merge-tools file | annotate | diff | comparison | revisions 
--- a/tests/run-tests.py	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/run-tests.py	Tue Feb 10 22:47:38 2009 +0100
@@ -483,7 +483,7 @@
     INST = options.with_hg
 else:
     INST = os.path.join(HGTMP, "install")
-BINDIR = os.path.join(INST, "bin")
+BINDIR = os.environ["BINDIR"] = os.path.join(INST, "bin")
 PYTHONDIR = os.path.join(INST, "lib", "python")
 COVERAGE_FILE = os.path.join(TESTDIR, ".coverage")
 
--- a/tests/test-merge-tools	Mon Feb 16 17:37:23 2009 -0600
+++ b/tests/test-merge-tools	Tue Feb 10 22:47:38 2009 +0100
@@ -58,7 +58,10 @@
 echo
 
 echo "# default is internal merge:"
-domerge -r 2
+beforemerge
+echo "# hg merge -r 2"
+PATH=$BINDIR hg merge -r 2
+aftermerge
 
 echo "# simplest hgrc using false for merge:"
 echo "false.whatever=" >> .hg/hgrc
mercurial