Mercurial > hg
view mercurial/mergeutil.py @ 46519:83ac7c91e172
bundle2: pass the operation source down to the changegroup
This is currently not used by anything in core (and redundant with the url), the
real source information is much more useful. This is going to be used in
sidedata exchange patches coming soon.
Differential Revision: https://phab.mercurial-scm.org/D9986
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Fri, 12 Feb 2021 09:53:48 +0100 |
parents | dfca84970da8 |
children | d4ba4d51f85f |
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 ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )