mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
ab3a7cb21f
Summary: In preparation for merging fb-mercurial sources to the Eden repository, move everything from the top-level directory into an `eden/scm` subdirectory.
27 lines
850 B
Python
27 lines
850 B
Python
# Portions Copyright (c) Facebook, Inc. and its affiliates.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2.
|
|
|
|
# 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 . import error
|
|
from .i18n import _
|
|
|
|
|
|
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'),
|
|
)
|