--- a/tests/test-keyword	Fri Sep 14 22:34:47 2007 +0100
+++ b/tests/test-keyword	Fri Sep 14 23:00:26 2007 +0100
@@ -143,10 +143,24 @@
 # remove path to temp dir for backwards compatibility
 hg incoming | grep -v '^comparing with'
 
+cd ../Test
+echo % canonpath for kwexpand/kwshrink
+mkdir x
+echo % copy
+hg copy a x/a
+cd x
+hg --debug commit -m xa -d '3 0' -u 'User Name <user@example.com>'
+echo % cat a
+cat a
+echo % kwshrink a
+hg --verbose kwshrink a
+echo % cat a
+cat a
+cd -
+
 echo % switch off expansion
-cd ../Test
 echo % kwshrink
-hg --debug kwshrink
+hg --verbose kwshrink
 echo % cat
 cat a b
 echo % hg cat

--- a/tests/test-keyword.out	Fri Sep 14 22:34:47 2007 +0100
+++ b/tests/test-keyword.out	Fri Sep 14 23:00:26 2007 +0100
@@ -197,9 +197,27 @@
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
+% canonpath for kwexpand/kwshrink
+% copy
+x/a
+ x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
+overwriting x/a expanding keywords
+% cat a
+expand $Id: x/a 2d19a72f00da Thu, 01 Jan 1970 00:00:03 +0000 user $
+do not process $Id:
+xxx $
+$Xinfo: User Name <user@example.com>: xa $
+% kwshrink a
+overwriting x/a shrinking keywords
+% cat a
+expand $Id$
+do not process $Id:
+xxx $
+$Xinfo$
 % switch off expansion
 % kwshrink
 overwriting a shrinking keywords
+overwriting x/a shrinking keywords
 % cat
 expand $Id$
 do not process $Id: