diff options
author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
---|---|---|
committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-pull-pull-corruption.t | |
parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
download | mercurial-tarball-master.tar.gz |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-pull-pull-corruption.t')
-rw-r--r-- | tests/test-pull-pull-corruption.t | 19 |
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 .. |