Mercurial > hg-stable

view mercurial/mergeutil.py @ 46157:021925827c60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies-rust: record overwrite when merging When detecting fresh value (from current rev) overwriting older ones during merges, we also record this overwrite for to help potential future comparison. This does really have any performance effect right now, but it get use closer to be able to drop all `is_ancestors` when merging. Differential Revision: https://phab.mercurial-scm.org/D9499
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 02 Dec 2020 15:37:54 +0100
parents fa87536d3d70
children dfca84970da8
line wrap: on
line source

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