[Updated] D11367: dirstate-item: implement `merged` in a simpler way

[marmoute (Pierre-Yves David)]

Closed by commit rHG7c37d153c22d: dirstate-item: implement `merged` in a simpler way (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/D11367?vs=30144&id=30158

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

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

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
@@ -276,7 +276,7 @@
 
         Should only be set if a merge is in progress in the dirstate
         """
-        return self.v1_state() == b'm'
+        return self._wc_tracked and self._merged
 
     @property
     def from_p2(self):



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