# HG changeset patch
# User Peter van Dijk <peter@dataloss.nl>
# Date 1140620263 -3600
# Node ID ba198d17eea9e599ef8746bf085f3af900c66910
# Parent  c71420b186b08e5fa78514a01aa0d5390af8f7ba
changes by John Levon to standardize some erroroutput

diff -r c71420b186b0 -r ba198d17eea9 tests/test-clone
--- a/tests/test-clone	Wed Feb 22 15:42:48 2006 +0100
+++ b/tests/test-clone	Wed Feb 22 15:57:43 2006 +0100
@@ -16,7 +16,7 @@
 # No update
 hg clone -U . ../c
 cd ../c
-cat a
+cat a 2>/dev/null || echo "a not present"
 hg verify
 
 # Default destination
diff -r c71420b186b0 -r ba198d17eea9 tests/test-clone.out
--- a/tests/test-clone.out	Wed Feb 22 15:42:48 2006 +0100
+++ b/tests/test-clone.out	Wed Feb 22 15:57:43 2006 +0100
@@ -4,7 +4,7 @@
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
-cat: a: No such file or directory
+a not present
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
diff -r c71420b186b0 -r ba198d17eea9 tests/test-copy
--- a/tests/test-copy	Wed Feb 22 15:42:48 2006 +0100
+++ b/tests/test-copy	Wed Feb 22 15:57:43 2006 +0100
@@ -20,7 +20,7 @@
 hg debugindex .hg/data/b.i
 
 echo "this should show the rename information in the metadata"
-hg debugdata .hg/data/b.d 0 | head -n 3 | tail -n 2
+hg debugdata .hg/data/b.d 0 | head -3 | tail -2
 
 $TESTDIR/md5sum.py .hg/data/b.d
 hg cat b > bsum
diff -r c71420b186b0 -r ba198d17eea9 tests/test-empty-dir
--- a/tests/test-empty-dir	Wed Feb 22 15:42:48 2006 +0100
+++ b/tests/test-empty-dir	Wed Feb 22 15:57:43 2006 +0100
@@ -10,7 +10,7 @@
 hg commit -m "second" -d "0 0" sub/b
 cat sub/b
 hg co 0
-cat sub/b
-ls sub
+cat sub/b 2>/dev/null || echo "sub/b not present"
+ls sub 2>/dev/null || echo "sub not present"
 
 true
diff -r c71420b186b0 -r ba198d17eea9 tests/test-empty-dir.out
--- a/tests/test-empty-dir.out	Wed Feb 22 15:42:48 2006 +0100
+++ b/tests/test-empty-dir.out	Wed Feb 22 15:57:43 2006 +0100
@@ -1,3 +1,3 @@
 321
-cat: sub/b: No such file or directory
-ls: sub: No such file or directory
+sub/b not present
+sub not present