diff mercurial/copies.py @ 42164:96bd75e67a94

copies: fix up "fullcopy" with missing entries from "copy"

This is just a workaround similar to the previous one. It will make it
easier to follow later patches.

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

--- a/mercurial/copies.py	Sun Apr 14 00:46:25 2019 -0700
+++ b/mercurial/copies.py	Mon Apr 15 16:41:43 2019 -0700
@@ -687,6 +687,10 @@
     for dst, src in fullcopy.copy().items():
         if src not in mb:
             del fullcopy[dst]
+    # Sometimes we forget to add entries from "copy" to "fullcopy", so fix
+    # that up here
+    for dst, src in copy.items():
+        fullcopy[dst] = src
     if fullcopy and repo.ui.debugflag:
         repo.ui.debug("  all copies found (* = to merge, ! = divergent, "
                       "% = renamed and deleted):\n")