Mercurial > hg

view mercurial/mergeutil.py @ 45619:e8078af6af30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED ACTION_KEEP_NEW and ACTION_CHANGED_DELETED are conflicting actions as one says that file is new while other says that file was present earlier and has changed-delete conflicts. Let's do changed-delete which will lead to conflicts and make user choose the right way.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 30 Sep 2020 18:07:21 +0530
parents 32ce4cbaec4b
children fa87536d3d70
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.Abort(
            _(b"unresolved merge conflicts (see 'hg help resolve')")
        )