--- a/tests/test-keyword Sat Feb 09 20:17:06 2008 +0100
+++ b/tests/test-keyword Sat Feb 09 20:17:09 2008 +0100
@@ -30,13 +30,25 @@
echo % kwshrink should exit silently in empty/invalid repo
hg kwshrink
+# Symlinks cannot be created on Windows. The bundle was made with:
+#
+# hg init t
+# cd t
+# echo a > a
+# ln -s a sym
+# hg add sym
+# hg ci -m addsym -u mercurial
+# hg bundle --base null ../test-keyword.hg
+#
+hg pull -u "$TESTDIR/test-keyword.hg" \
+ | sed 's/pulling from.*test-keyword.hg/pulling from 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
+cat a b
echo % addremove
hg addremove
@@ -56,7 +68,7 @@
echo % identify
hg --quiet identify
echo % cat
-cat sym a b
+cat a b
echo % hg cat
hg cat sym a b
@@ -88,7 +100,7 @@
echo % update
hg update
echo % cat
-cat sym a b
+cat a b
echo % check whether expansion is filewise
echo '$Id$' > c
@@ -137,7 +149,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
@@ -157,7 +169,7 @@
EOF
echo % cat
-cat sym a b
+cat a b
echo % hg cat
hg cat sym a b
@@ -180,7 +192,7 @@
hg status
echo % cat
-cat sym a b
+cat a b
echo % hg cat
hg cat sym a b
echo
@@ -201,7 +213,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]
@@ -222,7 +234,7 @@
echo % import
hg import ../rejecttest.diff
echo % cat
-cat sym a b
+cat a b
echo
echo % rollback
hg rollback
@@ -248,20 +260,20 @@
cd ..
echo % kwexpand nonexistent
-hg kwexpand nonexistent
+hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
echo % switch off expansion
echo % kwshrink with unknown file u
cp a u
hg --verbose kwshrink
echo % cat
-cat sym a b
+cat a b
echo % hg cat
hg cat sym a b
echo
rm $HGRCPATH
echo % cat
-cat sym a b
+cat a b
echo % hg cat
hg cat sym a b
echo