--- a/mercurial/scmutil.py Fri Mar 06 10:52:44 2020 +0100
+++ b/mercurial/scmutil.py Fri Mar 06 13:27:41 2020 -0500
@@ -1457,10 +1457,10 @@
# Merge old parent and old working dir copies
oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
oldcopies.update(copies)
- copies = dict(
- (dst, oldcopies.get(src, src))
+ copies = {
+ dst: oldcopies.get(src, src)
for dst, src in pycompat.iteritems(oldcopies)
- )
+ }
# Adjust the dirstate copies
for dst, src in pycompat.iteritems(copies):
if src not in newctx or dst in newctx or ds[dst] != b'a':