Patchwork D11597: dirstate-item: drop the `from_p2` property

login
register
mail settings
Submitter phabricator
Date Oct. 3, 2021, 12:41 a.m.
Message ID <differential-rev-PHID-DREV-gjsroosv5k7thomfvamn-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49921/
State Superseded
Headers show

Comments

phabricator - Oct. 3, 2021, 12:41 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  It has no user anymore.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/pure/parsers.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py
+++ b/mercurial/pure/parsers.py
@@ -314,14 +314,6 @@ 
         return self._wc_tracked and self._p2_info
 
     @property
-    def merged(self):
-        """True if the file has been merged
-
-        Should only be set if a merge is in progress in the dirstate
-        """
-        return self._wc_tracked and self._p1_tracked and self._p2_info
-
-    @property
     def removed(self):
         """True if the file has been removed"""
         return not self._wc_tracked and (self._p1_tracked or self._p2_info)