mercurial/mergeutil.py
author Kevin Bullock <kbullock@ringworld.org>
Sat, 05 May 2018 18:03:01 -0500
branchstable
changeset 37835 1f65d7d46545
parent 30494 c1149533676b
child 43076 2372284d9457
permissions -rw-r--r--
Added signature for changeset 6614cac550ae

# 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 _

from . import (
    error,
)

def checkunresolved(ms):
    if list(ms.unresolved()):
        raise error.Abort(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))