--- a/tests/test-keyword	Sun Feb 18 20:10:37 2007 +0100
+++ b/tests/test-keyword	Wed Feb 21 02:27:15 2007 +0100
@@ -4,36 +4,38 @@
 [extensions]
 hgext.keyword =
 [keyword]
-* =
-b* = ignore
+a =
+b = ignore
 EOF
 
 echo % help
 hg help keyword
 
-hg init a
-cd a
-echo '$Id$' > a
-echo '$Id$' > b
+hg init Test
+cd Test
+echo 'expand $Id$' > 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 -m ab -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 % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
 
-rm a b
+echo
+rm sym a b
 echo % update
 hg update
 echo % cat
-cat a b
+cat sym a b
 
 echo % custom keyword expansion
 cat <<EOF >>$HGRCPATH
@@ -43,10 +45,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
@@ -60,21 +63,34 @@
 hg status
 
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
+
+echo
+cd ..
+hg clone -r0 Test Test-a
+cd Test-a
+cat <<EOF >> .hg/hgrc
+[paths]
+default = ../Test
+EOF
+echo % incoming
+hg incoming
 
 echo % switch off expansion
 rm $HGRCPATH
 
+cd ../Test
 echo % cat
-cat a b
+cat sym a b
 echo % hg cat
-hg cat a b
+hg cat sym a b
 
+echo
 echo % update
-rm a b
+rm sym a b
 hg update
 
 echo % cat
-cat a b
+cat sym a b