##// END OF EJS Templates
status: process `from_p2` file the same as `merged` one...
status: process `from_p2` file the same as `merged` one What matters here is that the file constains information coming from the second parent and should be considered `modified` on plain `hg status. So we can process `from_p2` file sooner. It also highlight that we probably don't need the merged/from_p2 distinction at higher level. Differential Revision: https://phab.mercurial-scm.org/D11591

File last commit:

r43346:2372284d default
r48959:142e9f0a default
Show More
error.py
15 lines | 413 B | text/x-python | PythonLexer
# 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"""