--- a/mercurial/copies.py Fri Jan 24 07:00:45 2020 -0800
+++ b/mercurial/copies.py Wed Jan 22 15:20:12 2020 -0800
@@ -563,6 +563,9 @@
copies1 = pathcopies(base, c1)
copies2 = pathcopies(base, c2)
+ if not (copies1 or copies2):
+ return {}, {}, {}, {}, {}
+
inversecopies1 = {}
inversecopies2 = {}
for dst, src in copies1.items():
@@ -632,8 +635,6 @@
fullcopy = copies1.copy()
fullcopy.update(copies2)
- if not fullcopy:
- return copy, {}, diverge, renamedelete, {}
if repo.ui.debugflag:
repo.ui.debug(