# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1246969258 -7200
# Node ID 500013d3b6a984187c140cc4ebc1cd66b4800503
# Parent  95046688f80fbe481241ed3affeed205ce378b7e# Parent  d4d4da54ab05c24596c3e98acbd7f052e443b2c1
merge with crew-stable

diff -r 95046688f80f -r 500013d3b6a9 tests/test-convert-p4
--- a/tests/test-convert-p4	Sun Jul 05 18:52:55 2009 -0400
+++ b/tests/test-convert-p4	Tue Jul 07 14:20:58 2009 +0200
@@ -6,7 +6,7 @@
 echo "convert = " >> $HGRCPATH
 
 echo % create p4 depot
-P4ROOT=$PWD/depot; export P4ROOT
+P4ROOT=`pwd`/depot; export P4ROOT
 P4AUDIT=$P4ROOT/audit; export P4AUDIT
 P4JOURNAL=$P4ROOT/journal; export P4JOURNAL
 P4LOG=$P4ROOT/log; export P4LOG
diff -r 95046688f80f -r 500013d3b6a9 tests/test-template-engine
--- a/tests/test-template-engine	Sun Jul 05 18:52:55 2009 -0400
+++ b/tests/test-template-engine	Tue Jul 07 14:20:58 2009 +0200
@@ -20,7 +20,7 @@
 
 hg init test
 echo '[extensions]' > test/.hg/hgrc
-echo "engine = $PWD/engine.py" >> test/.hg/hgrc
+echo "engine = `pwd`/engine.py" >> test/.hg/hgrc
 
 cd test
 cat > mymap << EOF