Mercurial > hg

view mercurial/mergeutil.py @ 47689:f2aef39abc14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-map: factor out the change to _dirs and _alldirs on removing This logic is complicated enough to deserves its own function. So it now does. This will make it easier to reuse that logic in later changeset. Differential Revision: https://phab.mercurial-scm.org/D11131
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 15 Jul 2021 02:19:41 +0200
parents d4ba4d51f85f
children 6000f5b25c9b
line wrap: on
line source

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Olivia Mackall <olivia@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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )