Show More
@@ -1,44 +1,40 b'' | |||||
1 | $ hg init |
|
1 | $ hg init | |
2 | $ echo This is file a1 > a |
|
2 | $ echo This is file a1 > a | |
3 | $ echo This is file b1 > b |
|
3 | $ echo This is file b1 > b | |
4 | $ hg add a b |
|
4 | $ hg add a b | |
5 | $ hg commit -m "commit #0" |
|
5 | $ hg commit -m "commit #0" | |
6 | $ echo This is file b22 > b |
|
6 | $ echo This is file b22 > b | |
7 | $ hg commit -m "comment #1" |
|
7 | $ hg commit -m "comment #1" | |
8 | $ hg update 0 |
|
8 | $ hg update 0 | |
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
10 | $ rm b |
|
10 | $ rm b | |
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 |
|
16 | $ hg update | |
17 | abort: not a linear update |
|
17 | abort: not a linear update | |
18 | (merge or update --check to force update) |
|
18 | (merge or update --check to force update) | |
19 | [255] |
|
19 | [255] | |
20 | $ rm b |
|
20 | $ rm b | |
21 | $ hg update -c |
|
21 | $ hg update -c | |
22 | abort: uncommitted changes |
|
22 | abort: uncommitted changes | |
23 | [255] |
|
23 | [255] | |
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 |
|
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 |
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now