--- a/tests/test-keyword	Tue Feb 05 16:22:40 2008 +0100
+++ b/tests/test-keyword	Wed Feb 06 00:24:49 2008 +0100
@@ -24,17 +24,29 @@
 
 hg --quiet kwdemo "Branch = {branches}"
 
+hg init t
+cd t
+echo % kwshrink should exit silently in empty/invalid repo
+hg kwshrink
+
+echo % symlink nonexisting file
+ln -s a sym
+echo % commit hook must fail with missing file
+hg --debug commit -A -msym -d '0 0' -u 'User Name <user@example.com>'
+echo % bundle null revision containing empty symlink
+hg bundle --base null ../test-keyword.hg
+cd ..
+
 hg init Test
 cd Test
 
-echo % kwshrink should exit silently in empty/invalid repo
-hg kwshrink
+echo % pull from bundle
+hg pull --traceback -u ../test-keyword.hg
 
 echo 'expand $Id$' > a
 echo 'do not process $Id:' >> a
 echo 'xxx $' >> a
 echo 'ignore $Id$' > b
-ln -s a sym
 echo % cat
 cat sym a b
 
@@ -50,7 +62,7 @@
 hg status
 
 echo % commit
-hg --debug commit -mabsym -d '0 0' -u 'User Name <user@example.com>'
+hg --debug commit -mabsym -d '1 0' -u 'User Name <user@example.com>'
 echo % status
 hg status
 echo % identify
@@ -84,7 +96,7 @@
 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>'
+hg commit -A -mcndiff -d '2 0' -u 'User Name <user@example.com>'
 echo % force expansion
 hg -v kwexpand
 echo % compare changenodes in a c
@@ -114,7 +126,7 @@
 hg kwfiles
 
 echo % commit
-hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
+hg --debug commit -ma2c -d '2 0' -u 'User Name <user@example.com>'
 echo % cat a c
 cat a c
 echo % touch copied c after 1 second
@@ -127,7 +139,7 @@
 hg kwfiles
 
 echo % diff --rev
-hg diff --rev 0 | grep -v 'b/c'
+hg diff --rev 1 | grep -v 'b/c'
 
 echo % rollback
 hg rollback
@@ -164,7 +176,7 @@
 hg status
 
 echo % commit
-hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
+hg --debug commit -l log -d '3 0' -u 'User Name <user@example.com>'
 rm log
 echo % status
 hg status
@@ -191,7 +203,7 @@
 
 echo % clone to test incoming
 cd ..
-hg clone -r0 Test Test-a
+hg clone -r1 Test Test-a
 cd Test-a
 cat <<EOF >> .hg/hgrc
 [paths]
@@ -204,7 +216,7 @@
 sed -e 's/Id.*/& rejecttest/' a > a.new
 mv a.new a
 echo % commit rejecttest
-hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
+hg --debug commit -m'rejects?' -d '4 0' -u 'User Name <user@example.com>'
 echo % export
 hg export -o ../rejecttest.diff tip
 
@@ -228,7 +240,7 @@
 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>'
+hg --debug commit -m xa -d '4 0' -u 'User Name <user@example.com>'
 echo % cat a
 cat a
 echo % kwshrink a inside directory x