Mercurial > hg

view mercurial/mergeutil.py @ 46606:ced66295ea90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
narrow: remove assertion about working copy being clean The user can always modify the working copy, including while they're running `hg tracked --remove-include <path>`. Nothing really bad happens when they do that, and we already have code for printing a nice warning, so we can safely remove the assertion we had. Differential Revision: https://phab.mercurial-scm.org/D10063
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 23 Feb 2021 22:58:30 -0800
parents dfca84970da8
children d4ba4d51f85f
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 ms.unresolvedcount():
        raise error.StateError(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )