equal
deleted
inserted
replaced
11 $ hg commit -A -m "comment #2" |
11 $ hg commit -A -m "comment #2" |
12 removing b |
12 removing b |
13 created new head |
13 created new head |
14 $ hg update 1 |
14 $ hg update 1 |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 $ hg update |
|
17 abort: not a linear update |
|
18 (merge or update --check to force update) |
|
19 [255] |
|
20 $ rm b |
16 $ rm b |
21 $ hg update -c |
17 $ hg update -c 2 |
22 abort: uncommitted changes |
18 abort: uncommitted changes |
23 [255] |
19 [255] |
24 $ hg revert b |
20 $ hg revert b |
25 $ hg update -c |
21 $ hg update -c 2 |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
22 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
27 1 other heads for branch "default" |
|
28 $ mv a c |
23 $ mv a c |
29 |
24 |
30 Should abort: |
25 Should abort: |
31 |
26 |
32 $ hg update 1 |
27 $ hg update 1 |