--- a/hgext/histedit.py	Mon Oct 05 16:34:17 2015 -0700
+++ b/hgext/histedit.py	Tue Oct 06 15:09:28 2015 -0700
@@ -310,7 +310,8 @@
         return parentctxnode, rules, keep, topmost, replacements, backupfile
 
     def clear(self):
-        self.repo.vfs.unlink('histedit-state')
+        if self.inprogress():
+            self.repo.vfs.unlink('histedit-state')
 
     def inprogress(self):
         return self.repo.vfs.exists('histedit-state')