diff -r 649d3ac37a12 -r d783f945a701 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sun Oct 06 19:25:18 2019 -0400 +++ b/mercurial/cmdutil.py Mon Oct 07 00:04:04 2019 -0400 @@ -582,7 +582,7 @@ # 5. finally restore backed-up files try: dirstate = repo.dirstate - for realname, tmpname in backups.iteritems(): + for realname, tmpname in pycompat.iteritems(backups): ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) if dirstate[realname] == b'n':