merge with crew-stable
authorMartin Geisler <mg@lazybytes.net>
Tue, 07 Jul 2009 14:20:58 +0200
changeset 9045 500013d3b6a9
parent 9042 95046688f80f (current diff)
parent 9044 d4d4da54ab05 (diff)
child 9046 1547126630e9
merge with crew-stable
--- 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
--- 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