[Updated] D11372: dirstate-item: add more logic to `from_p2`

[marmoute (Pierre-Yves David)]

Closed by commit rHG97e9f3fd9324: dirstate-item: add more logic to `from_p2` (authored by marmoute).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11372?vs=30149&id=30163

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11372/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11372

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -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):



To: marmoute, #hg-reviewers, Alphare
Cc: Alphare, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210830/3e9cc4d2/attachment-0002.html>