marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This seem semantically better even if this tracking case seems to always comes with clean_p2 for now. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11372 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 @@ -286,7 +286,9 @@ Should only be set if a merge is in progress in the dirstate """ - return self._wc_tracked and self._clean_p2 + if not self._wc_tracked: + return False + return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) @property def from_p2_removed(self): 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
