Show More
@@ -31,7 +31,8 b' resolve -l should contain an unresolved ' | |||||
31 | $ hg resolve -l |
|
31 | $ hg resolve -l | |
32 | U file |
|
32 | U file | |
33 |
|
33 | |||
34 |
resolving an unknown path emit |
|
34 | resolving an unknown path should emit a warning | |
|
35 | ||||
35 | $ hg resolve -m does-not-exist |
|
36 | $ hg resolve -m does-not-exist | |
36 | arguments do not match paths that need resolving |
|
37 | arguments do not match paths that need resolving | |
37 |
|
38 | |||
@@ -42,11 +43,12 b' resolve the failure' | |||||
42 | (no more unresolved files) |
|
43 | (no more unresolved files) | |
43 | $ hg commit -m 'resolved' |
|
44 | $ hg commit -m 'resolved' | |
44 |
|
45 | |||
45 | resolve -l should be empty |
|
46 | resolve -l should be empty after commit | |
46 |
|
47 | |||
47 | $ hg resolve -l |
|
48 | $ hg resolve -l | |
48 |
|
49 | |||
49 |
resolve -m should abort |
|
50 | resolve -m should abort when no merge in progress | |
|
51 | ||||
50 | $ hg resolve -m |
|
52 | $ hg resolve -m | |
51 | abort: resolve command not applicable when not merging |
|
53 | abort: resolve command not applicable when not merging | |
52 | [255] |
|
54 | [255] | |
@@ -56,7 +58,7 b' test crashed merge with empty mergestate' | |||||
56 | $ mkdir .hg/merge |
|
58 | $ mkdir .hg/merge | |
57 | $ touch .hg/merge/state |
|
59 | $ touch .hg/merge/state | |
58 |
|
60 | |||
59 |
resolve -l |
|
61 | resolve -l should be empty | |
60 |
|
62 | |||
61 | $ hg resolve -l |
|
63 | $ hg resolve -l | |
62 |
|
64 |
General Comments 0
You need to be logged in to leave comments.
Login now