Patchwork D11596: dirstate-item: replace another usage of `merged`

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

Comments

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

REVISION SUMMARY
  We simply spell out the logic here. This was the last usage of `merged`.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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
@@ -334,7 +334,7 @@ 
             raise RuntimeError('untracked item')
         elif self.removed:
             return b'r'
-        elif self.merged:
+        elif self._p1_tracked and self._p2_info:
             return b'm'
         elif self.added:
             return b'a'