mergeutil.py
24 lines
| 701 B
| text/x-python
|
PythonLexer
/ mercurial / mergeutil.py
|
r30494 | # mergeutil.py - help for merge processing in mercurial | ||
# | ||||
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
# GNU General Public License version 2 or any later version. | ||||
from __future__ import absolute_import | ||||
from .i18n import _ | ||||
|
r43346 | from . import error | ||
|
r30494 | |||
def checkunresolved(ms): | ||||
if list(ms.unresolved()): | ||||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b"unresolved merge conflicts " b"(see 'hg help resolve')") | ||
|
r43346 | ) | ||
|
r43347 | if ms.mdstate() != b's' or list(ms.driverresolved()): | ||
|
r43346 | raise error.Abort( | ||
|
r43347 | _(b'driver-resolved merge conflicts'), | ||
hint=_(b'run "hg resolve --all" to resolve'), | ||||
|
r43346 | ) | ||