Show More
@@ -1,44 +1,40 b'' | |||
|
1 | 1 | $ hg init |
|
2 | 2 | $ echo This is file a1 > a |
|
3 | 3 | $ echo This is file b1 > b |
|
4 | 4 | $ hg add a b |
|
5 | 5 | $ hg commit -m "commit #0" |
|
6 | 6 | $ echo This is file b22 > b |
|
7 | 7 | $ hg commit -m "comment #1" |
|
8 | 8 | $ hg update 0 |
|
9 | 9 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
10 | 10 | $ rm b |
|
11 | 11 | $ hg commit -A -m "comment #2" |
|
12 | 12 | removing b |
|
13 | 13 | created new head |
|
14 | 14 | $ hg update 1 |
|
15 | 15 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
16 | 16 | $ hg update |
|
17 | 17 | abort: not a linear update |
|
18 | 18 | (merge or update --check to force update) |
|
19 | 19 | [255] |
|
20 | 20 | $ rm b |
|
21 | 21 | $ hg update -c |
|
22 | 22 | abort: uncommitted changes |
|
23 | 23 | [255] |
|
24 | 24 | $ hg revert b |
|
25 | 25 | $ hg update -c |
|
26 | 26 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
27 | 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 | 29 | Should abort: |
|
34 | 30 | |
|
35 |
$ hg update |
|
|
31 | $ hg update 1 | |
|
36 | 32 | abort: uncommitted changes |
|
37 | 33 | (commit or update --clean to discard changes) |
|
38 | 34 | [255] |
|
39 | 35 | $ mv c a |
|
40 | 36 | |
|
41 | 37 | Should succeed: |
|
42 | 38 | |
|
43 |
$ hg update |
|
|
39 | $ hg update 1 | |
|
44 | 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