Show More
| @@ -1,55 +1,80 b'' | |||
|
|
1 | #!/bin/sh | |
|
|
1 | $ hg init | |
|
|
2 | $ echo foo > a | |
|
|
3 | $ hg add a | |
|
|
4 | $ hg commit -m "1" | |
|
|
2 | 5 | |
|
|
3 | hg init | |
|
|
4 | echo foo > a | |
|
|
5 | hg add a | |
|
|
6 | hg commit -m "1" | |
|
|
6 | $ echo bar > b | |
|
|
7 | $ hg add b | |
|
|
8 | $ hg remove a | |
|
|
7 | 9 | |
|
|
8 | echo bar > b | |
|
|
9 | hg add b | |
|
|
10 | hg remove a | |
|
|
10 | Should show a removed and b added: | |
|
|
11 | ||
|
|
12 | $ hg status | |
|
|
13 | A b | |
|
|
14 | R a | |
|
|
11 | 15 | |
|
|
12 | echo "%%% should show a removed and b added" | |
|
|
13 | hg status | |
|
|
16 | $ hg revert --all | |
|
|
17 | undeleting a | |
|
|
18 | forgetting b | |
|
|
14 | 19 | |
|
|
15 | echo "reverting..." | |
|
|
16 | hg revert --all | |
|
|
20 | Should show b unknown and a back to normal: | |
|
|
21 | ||
|
|
22 | $ hg status | |
|
|
23 | ? b | |
|
|
24 | ||
|
|
25 | $ rm b | |
|
|
17 | 26 | |
|
|
18 | echo "%%% should show b unknown and a back to normal" | |
|
|
19 | hg status | |
|
|
27 | $ hg co -C 0 | |
|
|
28 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
|
29 | $ echo foo-a > a | |
|
|
30 | $ hg commit -m "2a" | |
|
|
20 | 31 | |
|
|
21 | rm b | |
|
|
22 | ||
|
|
23 | hg co -C 0 | |
|
|
24 | echo foo-a > a | |
|
|
25 | hg commit -m "2a" | |
|
|
32 | $ hg co -C 0 | |
|
|
33 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
|
34 | $ echo foo-b > a | |
|
|
35 | $ hg commit -m "2b" | |
|
|
36 | created new head | |
|
|
26 | 37 | |
|
|
27 | hg co -C 0 | |
|
|
28 | echo foo-b > a | |
|
|
29 | hg commit -m "2b" | |
|
|
38 | $ HGMERGE=true hg merge 1 | |
|
|
39 | merging a | |
|
|
40 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
|
|
41 | (branch merge, don't forget to commit) | |
|
|
30 | 42 | |
|
|
31 | HGMERGE=true hg merge 1 | |
|
|
43 | Should show foo-b: | |
|
|
44 | ||
|
|
45 | $ cat a | |
|
|
46 | foo-b | |
|
|
32 | 47 | |
|
|
33 | echo "%%% should show foo-b" | |
|
|
34 | cat a | |
|
|
48 | $ echo bar > b | |
|
|
49 | $ hg add b | |
|
|
50 | $ rm a | |
|
|
51 | $ hg remove a | |
|
|
35 | 52 | |
|
|
36 | echo bar > b | |
|
|
37 | hg add b | |
|
|
38 | rm a | |
|
|
39 | hg remove a | |
|
|
53 | Should show a removed and b added: | |
|
|
54 | ||
|
|
55 | $ hg status | |
|
|
56 | A b | |
|
|
57 | R a | |
|
|
40 | 58 | |
|
|
41 | echo "%%% should show a removed and b added" | |
|
|
42 | hg status | |
|
|
59 | Revert should fail: | |
|
|
60 | ||
|
|
61 | $ hg revert --all | |
|
|
62 | abort: uncommitted merge - please provide a specific revision | |
|
|
43 | 63 | |
|
|
44 | echo "%%% revert should fail" | |
|
|
45 | hg revert --all | |
|
|
64 | Revert should be ok now: | |
|
|
65 | ||
|
|
66 | $ hg revert -r2 --all | |
|
|
67 | undeleting a | |
|
|
68 | forgetting b | |
|
|
46 | 69 | |
|
|
47 | echo "%%% revert should be ok now" | |
|
|
48 | hg revert -r2 --all | |
|
|
70 | Should show b unknown and a marked modified (merged): | |
|
|
71 | ||
|
|
72 | $ hg status | |
|
|
73 | M a | |
|
|
74 | ? b | |
|
|
49 | 75 | |
|
|
50 | echo "%%% should show b unknown and a marked modified (merged)" | |
|
|
51 | hg status | |
|
|
76 | Should show foo-b: | |
|
|
52 | 77 | |
|
|
53 | echo "%%% should show foo-b" | |
|
|
54 | cat a | |
|
|
78 | $ cat a | |
|
|
79 | foo-b | |
|
|
55 | 80 | |
|
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now