Mercurial > hg

view mercurial/mergeutil.py @ 50109:bec7182cc406

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: mark the `copy` method as requiring a `changing_any` context This is used both when changing parents (e.g. merging with rename) and changing files (e.g. running `hg rename`).
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 20 Feb 2023 11:57:46 +0100
parents 6000f5b25c9b
children
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')")
        )