--- a/tests/test-keyword	Wed Jan 09 18:17:23 2008 +0100
+++ b/tests/test-keyword	Mon Jan 14 15:21:57 2008 +0100
@@ -45,7 +45,7 @@
 
 echo % default keyword expansion including commit hook
 #echo % interrupted commit should not change state or run commit hook
-#HGEDITOR=false hg --debug commit
+#hg --debug commit
 #echo % status
 #hg status
 
@@ -80,6 +80,19 @@
 echo % cat
 cat a b
 
+echo % check whether expansion is filewise
+echo '$Id$' > c
+echo 'tests for different changenodes' >> c
+echo % commit c
+hg commit -A -mcndiff -d '1 0' -u 'User Name <user@example.com>'
+echo % force expansion
+hg -v kwexpand
+echo % compare changenodes in a c
+cat a c
+echo % rollback and remove c
+hg rollback
+rm c
+
 echo % copy
 hg cp a c
 
@@ -130,9 +143,8 @@
 secondline
 EOF
 
-#echo % interrupted commit
-## redirection and grep for backwards compatibility
-#HGEDITOR=false hg commit 2>&1 | grep -v 'edit failed:'
+#echo % interrupted commit should not change state
+#hg commit
 #echo % status
 #hg status
 
@@ -206,7 +218,7 @@
 hg --verbose kwshrink a
 echo % cat a
 cat a
-cd - > /dev/null 2>&1
+cd ..
 
 echo % kwexpand nonexistent
 hg kwexpand nonexistent