mercurial/mergeutil.py
author Arseniy Alekseyev <aalekseyev@janestreet.com>
Fri, 12 Apr 2024 13:48:38 +0100
branchstable
changeset 51565 95c083d21ac6
parent 48875 6000f5b25c9b
permissions -rw-r--r--
tests: add an end-to-end test to show a bug in `visit_children_set` Concretely, `rootfilesin` is completely broken with respect to `visit_children_set` optimization.

# 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')")
        )