summaryrefslogtreecommitdiff
path: root/tests/test-pull-pull-corruption.t
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-pull-pull-corruption.t')
-rw-r--r--tests/test-pull-pull-corruption.t19
1 files changed, 8 insertions, 11 deletions
diff --git a/tests/test-pull-pull-corruption.t b/tests/test-pull-pull-corruption.t
index 4df2984..3294d72 100644
--- a/tests/test-pull-pull-corruption.t
+++ b/tests/test-pull-pull-corruption.t
@@ -37,27 +37,26 @@ use a hook to make the second pull start while the first one is still running
start a pull...
- $ hg pull ../source1 > pull.out 2>&1 &
+ $ hg pull ../source1 &
... and start another pull before the first one has finished
$ sleep 1
+ pulling from ../source1
+ requesting all changes
$ hg pull ../source2 2>/dev/null
pulling from ../source2
- searching for changes
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- (run 'hg heads' to see heads, 'hg merge' to merge)
- $ cat pull.out
- pulling from ../source1
- requesting all changes
+ added 10 changesets with 10 changes to 1 files
+ (run 'hg update' to get a working copy)
+ searching for 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)
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
see the result
@@ -68,5 +67,3 @@ see the result
crosschecking files in changesets and manifests
checking files
1 files, 11 changesets, 11 total revisions
-
- $ cd ..