[PATCH] test-repair-strip: Don't rely on cat error message
Mads Kiilerich
mads at kiilerich.com
Sun Jul 5 06:20:25 CDT 2009
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1246792294 -7200
# Node ID f615ad3622abcccb5d9e60a5f7d112e65767c832
# Parent a232b90ffb5110aeae75ff7ebf1a530ce8999bfd
test-repair-strip: Don't rely on cat error message
diff --git a/tests/test-repair-strip b/tests/test-repair-strip
--- a/tests/test-repair-strip
+++ b/tests/test-repair-strip
@@ -13,7 +13,7 @@
chmod +$3 $4
hg verify
echo % journal contents
- cat .hg/store/journal | sed 's/\.i[^\n]*/\.i/'
+ [ -f .hg/store/journal ] && cat .hg/store/journal | sed 's/\.i[^\n]*/\.i/' || echo 'journal not found'
ls .hg/store/journal >/dev/null 2>&1 && hg recover
ls .hg/strip-backup/* >/dev/null 2>&1 && hg unbundle -q .hg/strip-backup/*
rm -rf .hg/strip-backup
diff --git a/tests/test-repair-strip.out b/tests/test-repair-strip.out
--- a/tests/test-repair-strip.out
+++ b/tests/test-repair-strip.out
@@ -46,7 +46,7 @@
checking files
3 files, 4 changesets, 4 total revisions
% journal contents
-cat: .hg/store/journal: No such file or directory
+journal not found
% before update 0, strip 2
changeset: 0:cb9a9f314b8b
user: test
More information about the Mercurial-devel
mailing list