# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1285526689 18000
# Node ID 2f8740c639e4e07d6fd894eb6fe154250282fb29
# Parent  70ef9b470efe991dc7299709825eae4d1f020c5a
tests: unify test-pull-pull-corruption2

diff -r 70ef9b470efe -r 2f8740c639e4 tests/test-pull-pull-corruption2
--- a/tests/test-pull-pull-corruption2	Sun Sep 26 13:44:49 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Corrupt an hg repo with two pulls.
-#
-
-# create one repo with a long history
-hg init source1
-cd source1
-touch foo
-hg add foo
-for i in 1 2 3 4 5 6 7 8 9 10; do
-    echo $i >> foo
-    hg ci -m $i
-done
-cd ..
-
-# create a third repo to pull both other repos into it
-hg init version2
-hg -R version2 pull source1 &
-sleep 1
-
-hg clone --pull -U version2 corrupted
-wait
-hg -R corrupted verify
-hg -R version2 verify
diff -r 70ef9b470efe -r 2f8740c639e4 tests/test-pull-pull-corruption2.out
--- a/tests/test-pull-pull-corruption2.out	Sun Sep 26 13:44:49 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-pulling from source1
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 10 changesets with 10 changes to 1 files
-(run 'hg update' to get a working copy)
-requesting all changes
-adding changesets
-adding manifests
-adding file changes
-added 10 changesets with 10 changes to 1 files
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-1 files, 10 changesets, 10 total revisions
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-1 files, 10 changesets, 10 total revisions
diff -r 70ef9b470efe -r 2f8740c639e4 tests/test-pull-pull-corruption2.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull-pull-corruption2.t	Sun Sep 26 13:44:49 2010 -0500
@@ -0,0 +1,44 @@
+Corrupt an hg repo with two pulls.
+create one repo with a long history
+
+  $ hg init source1
+  $ cd source1
+  $ touch foo
+  $ hg add foo
+  $ for i in 1 2 3 4 5 6 7 8 9 10; do
+  >     echo $i >> foo
+  >     hg ci -m $i
+  > done
+  $ cd ..
+
+create a third repo to pull both other repos into it
+
+  $ hg init version2
+  $ hg -R version2 pull source1 &
+  $ sleep 1
+  pulling from source1
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 10 changesets with 10 changes to 1 files
+  (run 'hg update' to get a working copy)
+  $ hg clone --pull -U version2 corrupted
+  requesting all changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 10 changesets with 10 changes to 1 files
+  $ wait
+  $ hg -R corrupted verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  1 files, 10 changesets, 10 total revisions
+  $ hg -R version2 verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  1 files, 10 changesets, 10 total revisions