diff -r 2c843ad68528 -r d9531094cf8e mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Mon Apr 05 14:19:17 2021 +0800
+++ b/mercurial/cmdutil.py	Sat Apr 17 00:28:21 2021 -0400
@@ -3776,7 +3776,7 @@
             raise error.StateError(state.msg(), hint=state.hint())
 
     for s in statemod._unfinishedstates:
-        if s._opname == b'merge' or state._reportonly:
+        if s._opname == b'merge' or s._reportonly:
             continue
         if s._clearable and s.isunfinished(repo):
             util.unlink(repo.vfs.join(s._fname))