--- a/hgext/histedit.py	Wed Jul 15 20:39:23 2015 -0700
+++ b/hgext/histedit.py	Thu Jul 16 11:17:37 2015 -0700
@@ -750,6 +750,7 @@
 
     replacements = []
     state.keep = opts.get('keep', False)
+    supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt)
 
     # rebuild state
     if goal == 'continue':
@@ -881,7 +882,7 @@
         if mapping:
             movebookmarks(ui, repo, mapping, state.topmost, ntm)
             # TODO update mq state
-        if obsolete.isenabled(repo, obsolete.createmarkersopt):
+        if supportsmarkers:
             markers = []
             # sort by revision number because it sound "right"
             for prec in sorted(mapping, key=repo.changelog.rev):