diff -r 80a300088654 -r b05795ad5632 tests/test-keyword
--- a/tests/test-keyword	Tue Nov 06 13:20:39 2007 +0100
+++ b/tests/test-keyword	Wed Nov 07 13:40:58 2007 +0100
@@ -9,9 +9,7 @@
 EOF
 
 echo % help
-# grep for backwards compatibility
-hg help keyword \
-| grep -E -v '^list of commands|hg -v help keyword|^$'
+hg help keyword
 
 echo % hg kwdemo
 hg --quiet kwdemo --default \
@@ -35,31 +33,33 @@
 echo 'do not process $Id:' >> a
 echo 'xxx $' >> a
 echo 'ignore $Id$' > b
+ln -s a sym
 echo % cat
-cat a b
+cat sym a b
 
 echo % default keyword expansion
 echo % commit
-hg --debug commit -A -mab -d '0 0' -u 'User Name <user@example.com>'
+hg --debug commit -A -mabsym -d '0 0' -u 'User Name <user@example.com>'
 echo % status
 hg status
 echo % identify
 hg --quiet identify
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
 
+echo
 echo % touch
 touch a b
 echo % status
 hg status
 
-rm a b
+rm sym a b
 echo % update
 hg update
 echo % cat
-cat a b
+cat sym a b
 
 echo % copy
 hg cp a c
@@ -101,10 +101,11 @@
 EOF
 
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
 
+echo
 echo '$Xinfo$' >> a
 cat <<EOF >> log
 firstline
@@ -112,8 +113,7 @@
 EOF
 
 echo % interrupted commit
-# redirection and grep for backwards compatibility
-HGEDITOR=false hg commit 2>&1 | grep -v 'edit failed:'
+HGEDITOR=false hg commit
 echo % status
 hg status
 
@@ -124,9 +124,10 @@
 hg status
 
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
+echo
 
 echo % remove
 hg remove a
@@ -151,8 +152,8 @@
 default = ../Test
 EOF
 echo % incoming
-# remove path to temp dir for backwards compatibility
-hg incoming | grep -v '^comparing with'
+# remove path to temp dir
+hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
 
 cd ../Test
 echo % kwexpand/kwshrink on selected files
@@ -181,12 +182,13 @@
 cp a u
 hg --verbose kwshrink
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
-
+hg cat sym a b
+echo
 rm $HGRCPATH
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
+echo