Mercurial > hg
view hgext/fastannotate/error.py @ 44911:84614212ae39 stable
flags: actually merge flags in simplemerge
Since b86fc43e4b73, the local flag were blindly taken. This resulted in bug when
rename are involved. exec flag change are now properly merged (when merged from
the rename side).
Another bug is affecting this when merging from the side without the rename.
Differential Revision: https://phab.mercurial-scm.org/D8533
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:38:19 +0200 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
line wrap: on
line source
# Copyright 2016-present Facebook. All Rights Reserved. # # error: errors used in fastannotate # # 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 class CorruptedFileError(Exception): pass class CannotReuseError(Exception): """cannot reuse or update the cache incrementally"""