Mercurial > hg

changeset 9285:25255ce87bcf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Martin Geisler <mg@lazybytes.net>
date Wed, 29 Jul 2009 22:23:14 +0200
parents f9087eea293a (current diff) 4a1b24dbf753 (diff)
children a8fdcec4ab34
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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