# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1611821655 28800
# Node ID 892eb7c5edaaeb768e3ae7099e8271e68b937280
# Parent  29e3e46b0a22e02a90583116f52d713090dc983b
copies: fix an incorrect comment in graftcopies() from recent D9802

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.

Differential Revision: https://phab.mercurial-scm.org/D9899

diff -r 29e3e46b0a22 -r 892eb7c5edaa mercurial/copies.py
--- a/mercurial/copies.py	Wed Jan 27 22:10:57 2021 -0800
+++ b/mercurial/copies.py	Thu Jan 28 00:14:15 2021 -0800
@@ -1229,8 +1229,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]