view mercurial/mergeutil.py @ 45412:aaeccdb6e654 stable

repoview: pin revisions for `local` and `other` when a merge is active

I've hit this a couple of times, where pulling with a dirty `wdir` obsoletes
`p1` and updating to the successor results in merge conflicts.  The problem was
resolving them failed immediately, complaining that the old checkout was
filtered.

The change in `test-rebase-obsolete.t` is because there's an outstanding merge
conflict in a rebase operation.  The summary prompt to merge seems incorrect for
this scenario, but that's an existing issue.

Differential Revision: https://phab.mercurial-scm.org/D8980

# mergeutil.py - help for merge processing in mercurial
#
# Copyright 2005-2007 Matt Mackall <[e-mail]>
#
# 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')")
        )
    if ms.mdstate() != b's' or list(ms.driverresolved()):
        raise error.Abort(
            _(b'driver-resolved merge conflicts'),
            hint=_(b'run "hg resolve --all" to resolve'),
        )