# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1248898994 -7200
# Node ID 25255ce87bcfb753df078b2f8cabc6bcb5cb96ce
# Parent  f9087eea293a8d0550a5b1e9088c65c262a404f9# Parent  4a1b24dbf753ae7aa254f9ed7b8ac278fd91d4ad
Merge with crew-stable

diff -r f9087eea293a -r 25255ce87bcf tests/test-repair-strip
--- a/tests/test-repair-strip	Mon Jul 27 19:23:04 2009 -0700
+++ b/tests/test-repair-strip	Wed Jul 29 22:23:14 2009 +0200
@@ -13,7 +13,11 @@
     chmod +$3 $4
     hg verify
     echo % journal contents
-    cat .hg/store/journal | sed 's/\.i[^\n]*/\.i/'
+    if [ -f .hg/store/journal ]; then
+        sed -e 's/\.i[^\n]*/\.i/' .hg/store/journal
+    else
+        echo "(no journal)"
+    fi
     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 -r f9087eea293a -r 25255ce87bcf tests/test-repair-strip.out
--- a/tests/test-repair-strip.out	Mon Jul 27 19:23:04 2009 -0700
+++ b/tests/test-repair-strip.out	Wed Jul 29 22:23:14 2009 +0200
@@ -46,7 +46,7 @@
 checking files
 3 files, 4 changesets, 4 total revisions
 % journal contents
-cat: .hg/store/journal: No such file or directory
+(no journal)
 % before update 0, strip 2
 changeset:   0:cb9a9f314b8b
 user:        test