diff -r 908e4fe6c177 -r 1f1db3dc9ddf tests/test-keyword.t
--- a/tests/test-keyword.t	Sat Oct 09 12:26:56 2010 +0100
+++ b/tests/test-keyword.t	Sat Oct 09 15:47:19 2010 +0100
@@ -154,7 +154,7 @@
   do not process $Id:
   xxx $
   ignore $Id$
-  a* (glob)
+  a
 
 Test hook execution
 
@@ -180,6 +180,7 @@
   > [notify]
   > sources = pull
   > diffstat = False
+  > maxsubject = 15
   > [reposubs]
   > * = Test
   > EOF
@@ -197,13 +198,13 @@
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date: * (glob)
-  Subject: changeset in * (glob)
+  Subject: changeset in...
   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 +221,14 @@
   MIME-Version: 1.0
   Content-Transfer-Encoding: 7bit
   Date:* (glob)
-  Subject: changeset in* (glob)
+  Subject: changeset in...
   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
   
@@ -535,7 +536,7 @@
 
   $ cp sym i
   $ ls -l i
-  -rw-r--r-- * (glob)
+  -rw-r--r--* (glob)
   $ head -1 i
   expand $Id: a,v ef63ca68695b 1970/01/01 00:00:00 user $
   $ hg copy --after --verbose sym i
@@ -614,7 +615,7 @@
   do not process $Id:
   xxx $
   ignore $Id$
-  a* (glob)
+  a
 
 Write custom keyword and prepare multiline commit message
 
@@ -664,7 +665,7 @@
   xxx $
   $Xinfo: User Name <user@example.com>: firstline $
   ignore $Id$
-  a* (glob)
+  a
 
 annotate
 
@@ -735,7 +736,7 @@
   > default = ../Test
   > EOF
   $ hg incoming
-  comparing with *test-keyword.t/Test (glob)
+  comparing with $TESTTMP/Test
   searching for changes
   changeset:   2:bb948857c743
   tag:         tip
@@ -994,7 +995,7 @@
   xxx $
   $Xinfo: User Name <user@example.com>: firstline $
   ignore $Id$
-  a* (glob)
+  a
 
 Now disable keyword expansion
 
@@ -1011,4 +1012,4 @@
   xxx $
   $Xinfo$
   ignore $Id$
-  a* (glob)
+  a