diff -r ecf6d7aa874b -r 0428978bca22 mercurial/debugcommands.py --- a/mercurial/debugcommands.py Tue Oct 06 19:11:34 2020 +0530 +++ b/mercurial/debugcommands.py Sat Oct 10 12:43:04 2020 +0530 @@ -2107,7 +2107,7 @@ fm_files.end() fm_extras = fm.nested(b'extras') - for f, d in sorted(pycompat.iteritems(ms._stateextras)): + for f, d in sorted(pycompat.iteritems(ms.allextras())): if f in ms: # If file is in mergestate, we have already processed it's extras continue