##// END OF EJS Templates
tests: remove race in test-pull-pull-corruption.t...
Mads Kiilerich -
r16481:37e0872b stable
parent child Browse files
Show More
@@ -37,26 +37,27 b' use a hook to make the second pull start'
37
37
38 start a pull...
38 start a pull...
39
39
40 $ hg pull ../source1 &
40 $ hg pull ../source1 > pull.out 2>&1 &
41
41
42 ... and start another pull before the first one has finished
42 ... and start another pull before the first one has finished
43
43
44 $ sleep 1
44 $ sleep 1
45 pulling from ../source1
46 requesting all changes
47 $ hg pull ../source2 2>/dev/null
45 $ hg pull ../source2 2>/dev/null
48 pulling from ../source2
46 pulling from ../source2
49 adding changesets
50 adding manifests
51 adding file changes
52 added 10 changesets with 10 changes to 1 files
53 (run 'hg update' to get a working copy)
54 searching for changes
47 searching for changes
55 adding changesets
48 adding changesets
56 adding manifests
49 adding manifests
57 adding file changes
50 adding file changes
58 added 1 changesets with 1 changes to 1 files (+1 heads)
51 added 1 changesets with 1 changes to 1 files (+1 heads)
59 (run 'hg heads' to see heads, 'hg merge' to merge)
52 (run 'hg heads' to see heads, 'hg merge' to merge)
53 $ cat pull.out
54 pulling from ../source1
55 requesting all changes
56 adding changesets
57 adding manifests
58 adding file changes
59 added 10 changesets with 10 changes to 1 files
60 (run 'hg update' to get a working copy)
60
61
61 see the result
62 see the result
62
63
General Comments 0
You need to be logged in to leave comments. Login now