Submitter | phabricator |
---|---|
Date | Oct. 3, 2021, 12:40 a.m. |
Message ID | <differential-rev-PHID-DREV-paqsy6ow5kepejrxqbbg-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/49916/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -363,16 +363,12 @@ raise RuntimeError('untracked item') elif self.removed and self._p1_tracked and self._p2_info: return NONNORMAL - elif self.removed and self._p2_info: + elif self._p2_info: return FROM_P2 elif self.removed: return 0 - elif self.merged: - return FROM_P2 elif self.added: return NONNORMAL - elif self.from_p2: - return FROM_P2 elif self._size is None: return NONNORMAL else: