Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pure/parsers.py @ 48079:2943955304b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: inline the merged_removed logic It is used internally for compatibilty with size used in the `v1` format, but this is the only use. So we can simply inline it. Differential Revision: https://phab.mercurial-scm.org/D11512
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 28 Sep 2021 19:12:44 +0200
parents 46d1b75648f4
children 870100c0209b
line wrap: on
line diff
--- a/mercurial/pure/parsers.py	Tue Sep 28 18:57:20 2021 +0200
+++ b/mercurial/pure/parsers.py	Tue Sep 28 19:12:44 2021 +0200
@@ -386,7 +386,7 @@
             # the object has no state to record, this is -currently-
             # unsupported
             raise RuntimeError('untracked item')
-        elif self.merged_removed:
+        elif self.removed and self._merged:
             return NONNORMAL
         elif self.from_p2_removed:
             return FROM_P2