Mercurial > hg
view mercurial/mergeutil.py @ 45559:07731064ac41 stable 5.5.2
hgdemandimport: exclude more sqlalchemy modules
We could potentially exclude the entire sqlalchemy library.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Tue, 29 Sep 2020 14:38:46 -0700 |
parents | 8ff1ecfadcd1 |
children | 32ce4cbaec4b |
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 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'), )