tests/test-pull-update.out
changeset 5080 73fdc8bd3ed8
child 6338 0750f11152fe
equal deleted inserted replaced
5079:04c1474ccddd 5080:73fdc8bd3ed8
       
     1 adding foo
       
     2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
     3 % should fail
       
     4 pulling from ../tt
       
     5 searching for changes
       
     6 adding changesets
       
     7 adding manifests
       
     8 adding file changes
       
     9 added 1 changesets with 1 changes to 1 files (+1 heads)
       
    10 not updating, since new heads added
       
    11 (run 'hg heads' to see heads, 'hg merge' to merge)
       
    12 % should fail
       
    13 pulling from ../t
       
    14 searching for changes
       
    15 adding changesets
       
    16 adding manifests
       
    17 adding file changes
       
    18 added 1 changesets with 1 changes to 1 files (+1 heads)
       
    19 not updating, since new heads added
       
    20 (run 'hg heads' to see heads, 'hg merge' to merge)
       
    21 merging foo
       
    22 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
       
    23 (branch merge, don't forget to commit)
       
    24 % should work
       
    25 pulling from ../tt
       
    26 searching for changes
       
    27 adding changesets
       
    28 adding manifests
       
    29 adding file changes
       
    30 added 1 changesets with 1 changes to 1 files (-1 heads)
       
    31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved