# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1555372001 25200
# Node ID 22c9ffdf8ef68d6026ee2ddc3ef95fc726b22c60
# Parent  96bd75e67a94a36518a18e9b008cea49da5140d5
copies: fix up "fullcopy" with missing entries from "diverge"

Similar to the previous patch, but this doesn't even affect tests. It
does affect tests if you change them to turn on debug logging. I'm
fixing it here so reviewers of the later rewrite patch can hard-code
debug logging to be on and more easily compare test results.

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

diff -r 96bd75e67a94 -r 22c9ffdf8ef6 mercurial/copies.py
--- 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")