--- a/hgext/histedit.py	Thu Jul 16 11:17:37 2015 -0700
+++ b/hgext/histedit.py	Thu Jul 16 11:12:15 2015 -0700
@@ -797,8 +797,13 @@
                 break
         else:
             pass
-        cleanupnode(ui, repo, 'created', tmpnodes)
-        cleanupnode(ui, repo, 'temp', leafs)
+        if supportsmarkers:
+            obsolete.createmarkers(repo,
+                                   ((repo[t],()) for t in sorted(tmpnodes)))
+            obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(leafs)))
+        else:
+            cleanupnode(ui, repo, 'created', tmpnodes)
+            cleanupnode(ui, repo, 'temp', leafs)
         state.clear()
         return
     else:
@@ -893,8 +898,10 @@
                 obsolete.createmarkers(repo, markers)
         else:
             cleanupnode(ui, repo, 'replaced', mapping)
-
-    cleanupnode(ui, repo, 'temp', tmpnodes)
+    if supportsmarkers:
+        obsolete.createmarkers(repo, ((repo[t],()) for t in sorted(tmpnodes)))
+    else:
+        cleanupnode(ui, repo, 'temp', tmpnodes)
     state.clear()
     if os.path.exists(repo.sjoin('undo')):
         os.unlink(repo.sjoin('undo'))