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