diff -r 995066c41bb2 -r 3b039e43a1e6 mercurial/copies.py --- a/mercurial/copies.py Wed Nov 13 20:42:08 2019 +0100 +++ b/mercurial/copies.py Wed Nov 13 09:39:44 2019 +0100 @@ -281,10 +281,13 @@ iterrevs &= mrset iterrevs.update(roots) iterrevs.remove(b.rev()) - all_copies = {r: {} for r in roots} + all_copies = {} alwaysmatch = match.always() for r in sorted(iterrevs): - copies = all_copies.pop(r) + copies = all_copies.pop(r, None) + if copies is None: + # this is a root + copies = {} for i, c in enumerate(children[r]): p1, p2, p1copies, p2copies, removed = revinfo(c) if r == p1: