marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This simplify the conditionnal a bit since most of it is handled by the common code. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11326 AFFECTED FILES mercurial/dirstatemap.py CHANGE DETAILS diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -289,11 +289,8 @@ # In addition, this seems to be a case where the file is marked # as merged without actually being the result of a merge # action. So thing are not ideal here. - self.addfile(filename, merged=True) - return - else: - self.addfile(filename, from_p2=True) - return + merged = True + clean_p2 = False elif not p1_tracked and p2_tracked and wc_tracked: clean_p2 = True elif possibly_dirty: 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
