Mercurial > hg-stable
view mercurial/mergeutil.py @ 48867:2d0e22171ef9 stable
rhg: align the dirstate v2 writing algorithm with python
Use the same algorithm of file append as python does, where we do a manual
seek instead of relying on O_APPEND. (see the reasons in the inline comment)
author | Arseniy Alekseyev <aalekseyev@janestreet.com> |
---|---|
date | Thu, 19 May 2022 12:23:38 +0100 |
parents | d4ba4d51f85f |
children | 6000f5b25c9b |
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 __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')") )