--- a/tests/test-keyword.t	Thu Sep 30 09:49:40 2010 +0200
+++ b/tests/test-keyword.t	Fri Oct 08 22:36:10 2010 -0500
@@ -154,7 +154,7 @@
   do not process $Id:
   xxx $
   ignore $Id$
-  a* (glob)
+  a
 
 Test hook execution
 
@@ -197,13 +197,13 @@
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
-  Subject: changeset in * (glob)
+  Subject: changeset in $TESTTMP/Test: addsym
   From: mercurial
   X-Hg-Notification: changeset a2392c293916
   Message-Id: <hg.a2392c293916*> (glob)
   To: Test
   
-  changeset a2392c293916 in * (glob)
+  changeset a2392c293916 in $TESTTMP/Test
   details: *cmd=changeset;node=a2392c293916 (glob)
   description:
   	addsym
@@ -220,14 +220,14 @@
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date:* (glob)
-  Subject: changeset in* (glob)
+  Subject: changeset in $TESTTMP/Test: absym
   From: User Name <user@example.com>
   X-Hg-Notification: changeset ef63ca68695b
   Message-Id: <hg.ef63ca68695b*> (glob)
   To: Test
   
-  changeset ef63ca68695b in * (glob)
-  details: *cmd=changeset;node=ef63ca68695b (glob)
+  changeset ef63ca68695b in $TESTTMP/Test
+  details: $TESTTMP/Test?cmd=changeset;node=ef63ca68695b
   description:
   	absym
   
@@ -614,7 +614,7 @@
   do not process $Id:
   xxx $
   ignore $Id$
-  a* (glob)
+  a
 
 Write custom keyword and prepare multiline commit message
 
@@ -664,7 +664,7 @@
   xxx $
   $Xinfo: User Name <user@example.com>: firstline $
   ignore $Id$
-  a* (glob)
+  a
 
 annotate
 
@@ -735,7 +735,7 @@
   > default = ../Test
   > EOF
   $ hg incoming
-  comparing with */Test (glob)
+  comparing with $TESTTMP/Test
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
@@ -994,7 +994,7 @@
   xxx $
   $Xinfo: User Name <user@example.com>: firstline $
   ignore $Id$
-  a* (glob)
+  a
 
 Now disable keyword expansion
 
@@ -1011,4 +1011,4 @@
   xxx $
   $Xinfo$
   ignore $Id$
-  a* (glob)
+  a