martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY I don't think the bit about creating a merge in the filelog was correct. Or at least I couldn't find a case where it happened. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9899 AFFECTED FILES mercurial/copies.py CHANGE DETAILS diff --git a/mercurial/copies.py b/mercurial/copies.py --- a/mercurial/copies.py +++ b/mercurial/copies.py @@ -1221,8 +1221,11 @@ new_copies = pathcopies(base, ctx) parent = wctx.p1() _filter(parent, wctx, new_copies) - # extra filtering to drop copy information for files that existed before - # the graft (otherwise we would create merge filelog for non-merge commit + # Extra filtering to drop copy information for files that existed before + # the graft. This is to handle the case of grafting a rename onto a commit + # that already has the rename. Otherwise the presence of copy information + # would result in the creation of an empty commit where we would prefer to + # not create one. for dest, __ in list(new_copies.items()): if dest in parent: del new_copies[dest] To: martinvonz, #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
