Mercurial > hg
view mercurial/mergeutil.py @ 50294:bae51b50a5cf stable
dirstate-v2: fix an incorrect handling of readdir errors
Make sure not to cache the results of a failed readdir call.
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Mon, 13 Mar 2023 14:15:34 +0000 |
parents | 6000f5b25c9b |
children | f4733654f144 |
line wrap: on
line source
# mergeutil.py - help for merge processing in mercurial # # Copyright 2005-2007 Olivia Mackall <olivia@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 .i18n import _ from . import error def checkunresolved(ms): if ms.unresolvedcount(): raise error.StateError( _(b"unresolved merge conflicts (see 'hg help resolve')") )