D6247: copies: fix up "fullcopy" with missing entries from "diverge"
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Apr 17 18:21:28 EDT 2019
martinvonz updated this revision to Diff 14821.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6247?vs=14775&id=14821
REVISION DETAIL
https://phab.mercurial-scm.org/D6247
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
@@ -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")
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list