--- a/tests/test-keyword	Fri Oct 19 16:09:56 2007 +0200
+++ b/tests/test-keyword	Fri Oct 19 16:28:56 2007 +0200
@@ -155,15 +155,19 @@
 hg incoming | grep -v '^comparing with'
 
 cd ../Test
-echo % pathto for kwexpand/kwshrink
+echo % kwexpand/kwshrink on selected files
 mkdir x
-echo % copy
+echo % copy a x/a
 hg copy a x/a
+echo % kwexpand a
+hg --verbose kwexpand a
+echo % kwexpand x/a should abort
+hg --verbose kwexpand 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
+echo % kwshrink a inside directory x
 hg --verbose kwshrink a
 echo % cat a
 cat a

--- a/tests/test-keyword.out	Fri Oct 19 16:09:56 2007 +0200
+++ b/tests/test-keyword.out	Fri Oct 19 16:28:56 2007 +0200
@@ -207,8 +207,12 @@
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
-% pathto for kwexpand/kwshrink
-% copy
+% kwexpand/kwshrink on selected files
+% copy a x/a
+% kwexpand a
+overwriting a expanding keywords
+% kwexpand x/a should abort
+abort: outstanding uncommitted changes in given files
 x/a
  x/a: copy a:779c764182ce5d43e2b1eb66ce06d7b47bfe342e
 overwriting x/a expanding keywords
@@ -217,7 +221,7 @@
 do not process $Id:
 xxx $
 $Xinfo: User Name <user@example.com>: xa $
-% kwshrink a
+% kwshrink a inside directory x
 overwriting x/a shrinking keywords
 % cat a
 expand $Id$