Show More
@@ -1553,11 +1553,21 b' class localrepository(object):' | |||||
1553 | if merge and cctx.deleted(): |
|
1553 | if merge and cctx.deleted(): | |
1554 | raise error.Abort(_("cannot commit merge with missing files")) |
|
1554 | raise error.Abort(_("cannot commit merge with missing files")) | |
1555 |
|
1555 | |||
|
1556 | unresolved, driverresolved = False, False | |||
1556 | ms = mergemod.mergestate(self) |
|
1557 | ms = mergemod.mergestate(self) | |
1557 | for f in status.modified: |
|
1558 | for f in status.modified: | |
1558 |
if f in ms |
|
1559 | if f in ms: | |
|
1560 | if ms[f] == 'u': | |||
|
1561 | unresolved = True | |||
|
1562 | elif ms[f] == 'd': | |||
|
1563 | driverresolved = True | |||
|
1564 | ||||
|
1565 | if unresolved: | |||
1559 |
|
|
1566 | raise error.Abort(_('unresolved merge conflicts ' | |
1560 |
|
|
1567 | '(see "hg help resolve")')) | |
|
1568 | if driverresolved: | |||
|
1569 | raise error.Abort(_('driver-resolved merge conflicts'), | |||
|
1570 | hint=_('run "hg resolve --all" to resolve')) | |||
1561 |
|
1571 | |||
1562 | if editor: |
|
1572 | if editor: | |
1563 | cctx._text = editor(self, cctx, subs) |
|
1573 | cctx._text = editor(self, cctx, subs) |
General Comments 0
You need to be logged in to leave comments.
Login now