equal
deleted
inserted
replaced
24 $ hg revert b |
24 $ hg revert b |
25 $ hg update -c |
25 $ hg update -c |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
27 $ mv a c |
27 $ mv a c |
28 |
28 |
29 In theory, we shouldn't need the "-y" below, but it prevents this test |
|
30 from hanging when "hg update" erroneously prompts the user for "keep |
|
31 or delete". |
|
32 |
|
33 Should abort: |
29 Should abort: |
34 |
30 |
35 $ hg update -y 1 |
31 $ hg update 1 |
36 abort: uncommitted changes |
32 abort: uncommitted changes |
37 (commit or update --clean to discard changes) |
33 (commit or update --clean to discard changes) |
38 [255] |
34 [255] |
39 $ mv c a |
35 $ mv c a |
40 |
36 |
41 Should succeed: |
37 Should succeed: |
42 |
38 |
43 $ hg update -y 1 |
39 $ hg update 1 |
44 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |