tests/test-update-branches.out
changeset 9716 ea8c207a0f78
child 9717 68a1b9d0663e
equal deleted inserted replaced
9715:f0e99a2eac76 9716:ea8c207a0f78
       
     1 % initial repo state
       
     2 
       
     3 @  5:e1bb631146ca  b1
       
     4 |
       
     5 o  4:a4fdb3b883c4 0:b608b9236435  b1
       
     6 |
       
     7 | o  3:4b57d2520816 1:44592833ba9f
       
     8 | |
       
     9 | | o  2:063f31070f65
       
    10 | |/
       
    11 | o  1:44592833ba9f
       
    12 |/
       
    13 o  0:b608b9236435
       
    14 
       
    15 % norevtest none clean linear 4
       
    16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    17 parent=5
       
    18 % norevtest none clean same 2
       
    19 abort: crosses branches (use 'hg merge' or 'hg update -C')
       
    20 parent=2
       
    21 % revtest none clean linear 1 2
       
    22 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    23 parent=2
       
    24 % revtest none clean same 2 3
       
    25 abort: crosses branches (use 'hg merge' or 'hg update -C')
       
    26 parent=2
       
    27 % revtest none clean cross 3 4
       
    28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    29 parent=4
       
    30 % revtest none dirty linear 1 2
       
    31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    32 parent=2
       
    33 M foo
       
    34 % revtest none dirty same 2 3
       
    35 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
       
    36 parent=2
       
    37 M foo
       
    38 % revtest none dirty cross 3 4
       
    39 abort: crosses named branches (use 'hg update -C' to discard changes)
       
    40 parent=3
       
    41 M foo
       
    42 % revtest -C dirty linear 1 2
       
    43 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    44 parent=2
       
    45 % revtest -c dirty linear 1 2
       
    46 abort: uncommitted local changes
       
    47 parent=1
       
    48 M foo
       
    49 % norevtest -c clean same 2
       
    50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    51 parent=3
       
    52 % revtest -cC dirty linear 1 2
       
    53 abort: cannot specify both -c/--check and -C/--clean
       
    54 parent=1
       
    55 M foo