tests/test-mq-merge.t
changeset 12640 6cc4b14fb76b
parent 12399 4fee1fd3de9a
child 13520 9510ddf87c43
--- a/tests/test-mq-merge.t	Fri Oct 08 22:36:10 2010 -0500
+++ b/tests/test-mq-merge.t	Fri Oct 08 22:36:10 2010 -0500
@@ -32,7 +32,7 @@
 Save the patch queue so we can merge it later:
 
   $ hg qsave -c -e
-  copy */t/.hg/patches to */t/.hg/patches.1 (glob)
+  copy $TESTTMP/t/.hg/patches to $TESTTMP/t/.hg/patches.1
   $ checkundo
 
 Update b and commit in an "update" changeset:
@@ -52,7 +52,7 @@
   b
 
   $ hg qpush -a -m
-  merging with queue at: */t/.hg/patches.1 (glob)
+  merging with queue at: $TESTTMP/t/.hg/patches.1
   applying rm_a
   now at: rm_a
 
@@ -91,14 +91,14 @@
 Create the reference queue:
 
   $ hg qsave -c -e -n refqueue
-  copy */t2/.hg/patches to */t2/.hg/refqueue (glob)
+  copy $TESTTMP/t2/.hg/patches to $TESTTMP/t2/.hg/refqueue
   $ hg up -C 1
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 Merge:
 
   $ HGMERGE=internal:other hg qpush -a -m -n refqueue
-  merging with queue at: */t2/.hg/refqueue (glob)
+  merging with queue at: $TESTTMP/t2/.hg/refqueue
   applying patcha
   patching file a
   Hunk #1 FAILED at 0