##// END OF EJS Templates
persistent-nodemap: test that is it present after a clone...
persistent-nodemap: test that is it present after a clone The persistent nodemap is actually missing after local and stream clone. We start by adding a test for the case that works so that we can compare output after the fix. Differential Revision: https://phab.mercurial-scm.org/D9732

File last commit:

r46528:fa87536d default
r46865:7488067b default
Show More
mergeutil.py
19 lines | 498 B | text/x-python | PythonLexer
# 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.StateError(
_(b"unresolved merge conflicts (see 'hg help resolve')")
)