[PATCH 1 of 4] Document why test-convert and test-merge-tool set $PATH in two cases
Greg Ward
greg-hg at gerg.ca
Tue May 19 09:19:28 CDT 2009
# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1242740711 14400
# Node ID 5c250c2a62d8c8433a16f6e6475c4d0deb7a1504
# Parent 8c7f1afad064da0f2cc5442f76078b921fbd315b
Document why test-convert and test-merge-tool set $PATH in two cases.
diff --git a/tests/test-convert b/tests/test-convert
--- a/tests/test-convert
+++ b/tests/test-convert
@@ -47,4 +47,5 @@
echo % converting empty dir should fail "nicely"
mkdir emptydir
+# override $PATH to ensure p4 not visible
PATH=$BINDIR hg convert emptydir 2>&1 | sed 's,file://.*/emptydir,.../emptydir,g'
diff --git a/tests/test-merge-tools b/tests/test-merge-tools
--- a/tests/test-merge-tools
+++ b/tests/test-merge-tools
@@ -60,6 +60,7 @@
echo "# default is internal merge:"
beforemerge
echo "# hg merge -r 2"
+# override $PATH to ensure hgmerge not visible
PATH=$BINDIR hg merge -r 2
aftermerge
More information about the Mercurial-devel
mailing list