# HG changeset patch # User Pierre-Yves David # Date 1630080289 -7200 # Node ID 97e9f3fd93242852da112457cbcd38b498b9127c # Parent f94cc63df859c27851c2711aeaaad39b9e00daf0 dirstate-item: add more logic to `from_p2` This seem semantically better even if this tracking case seems to always comes with clean_p2 for now. Differential Revision: https://phab.mercurial-scm.org/D11372 diff -r f94cc63df859 -r 97e9f3fd9324 mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py Fri Aug 27 17:14:54 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Aug 27 18:04:49 2021 +0200 @@ -286,7 +286,9 @@ Should only be set if a merge is in progress in the dirstate """ - return self._wc_tracked and self._clean_p2 + if not self._wc_tracked: + return False + return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) @property def from_p2_removed(self):