Mercurial > public > mercurial-scm > hg-stable

view mercurial/mergeutil.py @ 49413:b5c8524827d2 stable 6.2.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-v2: no longer register the data-file during transaction If the data file change during the transaction, we cannot truncate it. The content of the file itself is fine as it will get backed up at the same time as the docket. Leaving the trailing data at the end of failed transaction is fine. The dirstate-v2 format supports it. The dead data will simply we written over if necessary.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 01 Sep 2022 15:49:14 +0200
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')")
        )