view mercurial/mergeutil.py @ 38756:91c405f84cf7 stable

sparse: add test showing `hg merge` is broken while using sparse extension

This patch adds a test to demonstrate that `hg merge` is broken in some cases
while using sparse extension.

The case is when you have a file which is:

  * modified between current wdir parent and merge base
  * deleted between merge base and merge destination
  * excluded from sparse checkout

Doing `hg merge` results in file not found error. Next patch will fix this.

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

# 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(_("unresolved merge conflicts "
                            "(see 'hg help resolve')"))
    if ms.mdstate() != 's' or list(ms.driverresolved()):
        raise error.Abort(_('driver-resolved merge conflicts'),
                          hint=_('run "hg resolve --all" to resolve'))