Show More
@@ -4922,7 +4922,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
4922 |
|
4922 | |||
4923 | ms = mergemod.mergestate(repo) |
|
4923 | ms = mergemod.mergestate(repo) | |
4924 |
|
4924 | |||
4925 | if not ms.active(): |
|
4925 | if not ms.active() and not show: | |
4926 | raise util.Abort(_('resolve command not applicable when not merging')) |
|
4926 | raise util.Abort(_('resolve command not applicable when not merging')) | |
4927 |
|
4927 | |||
4928 | m = scmutil.match(repo[None], pats, opts) |
|
4928 | m = scmutil.match(repo[None], pats, opts) |
@@ -85,8 +85,6 b' abort the edit' | |||||
85 |
|
85 | |||
86 | log after abort |
|
86 | log after abort | |
87 | $ hg resolve -l |
|
87 | $ hg resolve -l | |
88 | abort: resolve command not applicable when not merging |
|
|||
89 | [255] |
|
|||
90 | $ hg log --graph |
|
88 | $ hg log --graph | |
91 | @ changeset: 6:bfa474341cc9 |
|
89 | @ changeset: 6:bfa474341cc9 | |
92 | | tag: tip |
|
90 | | tag: tip |
@@ -42,9 +42,12 b' resolve the failure' | |||||
42 | no more unresolved files |
|
42 | no more unresolved files | |
43 | $ hg commit -m 'resolved' |
|
43 | $ hg commit -m 'resolved' | |
44 |
|
44 | |||
45 | resolve -l should error since no merge in progress |
|
45 | resolve -l should be empty | |
46 |
|
46 | |||
47 | $ hg resolve -l |
|
47 | $ hg resolve -l | |
|
48 | ||||
|
49 | resolve -m should abort since no merge in progress | |||
|
50 | $ hg resolve -m | |||
48 | abort: resolve command not applicable when not merging |
|
51 | abort: resolve command not applicable when not merging | |
49 | [255] |
|
52 | [255] | |
50 |
|
53 |
General Comments 0
You need to be logged in to leave comments.
Login now