Show More
@@ -3403,6 +3403,14 b' def command(table):' | |||
|
3403 | 3403 | |
|
3404 | 3404 | return cmd |
|
3405 | 3405 | |
|
3406 | def checkunresolved(ms): | |
|
3407 | if list(ms.unresolved()): | |
|
3408 | raise error.Abort(_("unresolved merge conflicts " | |
|
3409 | "(see 'hg help resolve')")) | |
|
3410 | if ms.mdstate() != 's' or list(ms.driverresolved()): | |
|
3411 | raise error.Abort(_('driver-resolved merge conflicts'), | |
|
3412 | hint=_('run "hg resolve --all" to resolve')) | |
|
3413 | ||
|
3406 | 3414 | # a list of (ui, repo, otherpeer, opts, missing) functions called by |
|
3407 | 3415 | # commands.outgoing. "missing" is "missing" of the result of |
|
3408 | 3416 | # "findcommonoutgoing()" |
@@ -1633,13 +1633,7 b' class localrepository(object):' | |||
|
1633 | 1633 | raise error.Abort(_("cannot commit merge with missing files")) |
|
1634 | 1634 | |
|
1635 | 1635 | ms = mergemod.mergestate.read(self) |
|
1636 | ||
|
1637 | if list(ms.unresolved()): | |
|
1638 | raise error.Abort(_("unresolved merge conflicts " | |
|
1639 | "(see 'hg help resolve')")) | |
|
1640 | if ms.mdstate() != 's' or list(ms.driverresolved()): | |
|
1641 | raise error.Abort(_('driver-resolved merge conflicts'), | |
|
1642 | hint=_('run "hg resolve --all" to resolve')) | |
|
1636 | cmdutil.checkunresolved(ms) | |
|
1643 | 1637 | |
|
1644 | 1638 | if editor: |
|
1645 | 1639 | cctx._text = editor(self, cctx, subs) |
General Comments 0
You need to be logged in to leave comments.
Login now