Show More
@@ -13,7 +13,7 b' test that a commit clears the merge stat' | |||||
13 | $ echo bar >> file2 |
|
13 | $ echo bar >> file2 | |
14 | $ hg commit -Am 'append bar to files' |
|
14 | $ hg commit -Am 'append bar to files' | |
15 |
|
15 | |||
16 | create a second head |
|
16 | create a second head with conflicting edits | |
17 |
|
17 | |||
18 | $ hg up -C 0 |
|
18 | $ hg up -C 0 | |
19 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
19 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -22,9 +22,17 b' create a second head' | |||||
22 | $ hg commit -Am 'append baz to files' |
|
22 | $ hg commit -Am 'append baz to files' | |
23 | created new head |
|
23 | created new head | |
24 |
|
24 | |||
|
25 | create a third head with no conflicting edits | |||
|
26 | $ hg up -qC 0 | |||
|
27 | $ echo foo > file3 | |||
|
28 | $ hg commit -Am 'add non-conflicting file' | |||
|
29 | adding file3 | |||
|
30 | created new head | |||
|
31 | ||||
25 | failing merge |
|
32 | failing merge | |
26 |
|
33 | |||
27 | $ hg merge --tool=internal:fail |
|
34 | $ hg up -qC 2 | |
|
35 | $ hg merge --tool=internal:fail 1 | |||
28 | 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
|
36 | 0 files updated, 0 files merged, 0 files removed, 2 files unresolved | |
29 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
37 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
30 | [1] |
|
38 | [1] | |
@@ -61,14 +69,39 b' resolve -l should be empty after commit' | |||||
61 |
|
69 | |||
62 | $ hg resolve -l |
|
70 | $ hg resolve -l | |
63 |
|
71 | |||
|
72 | resolve --all should abort when no merge in progress | |||
|
73 | ||||
|
74 | $ hg resolve --all | |||
|
75 | abort: resolve command not applicable when not merging | |||
|
76 | [255] | |||
|
77 | ||||
64 | resolve -m should abort when no merge in progress |
|
78 | resolve -m should abort when no merge in progress | |
65 |
|
79 | |||
66 | $ hg resolve -m |
|
80 | $ hg resolve -m | |
67 | abort: resolve command not applicable when not merging |
|
81 | abort: resolve command not applicable when not merging | |
68 | [255] |
|
82 | [255] | |
69 |
|
83 | |||
|
84 | set up conflict-free merge | |||
|
85 | ||||
|
86 | $ hg up -qC 3 | |||
|
87 | $ hg merge 1 | |||
|
88 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
89 | (branch merge, don't forget to commit) | |||
|
90 | ||||
|
91 | BROKEN: resolve --all should do nothing in merge without conflicts | |||
|
92 | $ hg resolve --all | |||
|
93 | abort: resolve command not applicable when not merging | |||
|
94 | [255] | |||
|
95 | ||||
|
96 | BROKEN: resolve -m should do nothing in merge without conflicts | |||
|
97 | ||||
|
98 | $ hg resolve -m | |||
|
99 | abort: resolve command not applicable when not merging | |||
|
100 | [255] | |||
|
101 | ||||
70 | test crashed merge with empty mergestate |
|
102 | test crashed merge with empty mergestate | |
71 |
|
103 | |||
|
104 | $ hg up -qC 1 | |||
72 | $ mkdir .hg/merge |
|
105 | $ mkdir .hg/merge | |
73 | $ touch .hg/merge/state |
|
106 | $ touch .hg/merge/state | |
74 |
|
107 |
General Comments 0
You need to be logged in to leave comments.
Login now