tests/test-pull-pull-corruption.t
changeset 34661 eb586ed5d8ce
parent 16913 f2719b387380
child 39489 f1186c292d03
equal deleted inserted replaced
34660:d00ec62d156f 34661:eb586ed5d8ce
    16   $ hg clone -r 0 source1 source2
    16   $ hg clone -r 0 source1 source2
    17   adding changesets
    17   adding changesets
    18   adding manifests
    18   adding manifests
    19   adding file changes
    19   adding file changes
    20   added 1 changesets with 1 changes to 1 files
    20   added 1 changesets with 1 changes to 1 files
       
    21   new changesets 495a0ec48aaf
    21   updating to branch default
    22   updating to branch default
    22   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    23   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    23   $ cd source2
    24   $ cd source2
    24   $ echo a >> foo
    25   $ echo a >> foo
    25   $ hg ci -m a
    26   $ hg ci -m a
    47   searching for changes
    48   searching for changes
    48   adding changesets
    49   adding changesets
    49   adding manifests
    50   adding manifests
    50   adding file changes
    51   adding file changes
    51   added 1 changesets with 1 changes to 1 files (+1 heads)
    52   added 1 changesets with 1 changes to 1 files (+1 heads)
       
    53   new changesets ca3c05af513e
    52   (run 'hg heads' to see heads, 'hg merge' to merge)
    54   (run 'hg heads' to see heads, 'hg merge' to merge)
    53   $ cat pull.out
    55   $ cat pull.out
    54   pulling from ../source1
    56   pulling from ../source1
    55   requesting all changes
    57   requesting all changes
    56   adding changesets
    58   adding changesets
    57   adding manifests
    59   adding manifests
    58   adding file changes
    60   adding file changes
    59   added 10 changesets with 10 changes to 1 files
    61   added 10 changesets with 10 changes to 1 files
       
    62   new changesets 495a0ec48aaf:1e7b6c812ca8
    60   (run 'hg update' to get a working copy)
    63   (run 'hg update' to get a working copy)
    61 
    64 
    62 see the result
    65 see the result
    63 
    66 
    64   $ wait
    67   $ wait