marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This is simpler. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11593 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 @@ -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: To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
