Mercurial > hg

view mercurial/mergeutil.py @ 51182:a93e52f0b6ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: disallow delayed write on inline changesets Since this will never happens, we can make the situation invalid and to stop to handling the associated the case. This simplify the random access file reading too.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 07 Dec 2023 02:07:16 +0100
parents 6000f5b25c9b
children f4733654f144
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 .i18n import _

from . import error


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