mercurial/mergeutil.py
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Thu, 01 Aug 2024 13:04:38 +0100
branchstable
changeset 51670 955084b4f74f
parent 48966 6000f5b25c9b
permissions -rw-r--r--
rhg: ignore readonly FS error when saving dirstate The error is already ignored when the .hg directory is read-only, so this is only fair. (the python hg is silent on readonly fs, too)

# 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 .i18n import _

from . import error


def checkunresolved(ms):
    if ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )