--- a/hgext/rebase.py	Sat Jun 24 21:01:28 2017 -0700
+++ b/hgext/rebase.py	Sat Jun 24 21:13:48 2017 -0700
@@ -1148,6 +1148,10 @@
 def clearstatus(repo):
     'Remove the status files'
     _clearrebasesetvisibiliy(repo)
+    # Make sure the active transaction won't write the state file
+    tr = repo.currenttransaction()
+    if tr:
+        tr.removefilegenerator('rebasestate')
     repo.vfs.unlinkpath("rebasestate", ignoremissing=True)
 
 def needupdate(repo, state):