--- a/hgext/histedit.py	Mon Aug 03 06:08:37 2015 -0700
+++ b/hgext/histedit.py	Mon Aug 03 06:11:45 2015 -0700
@@ -792,7 +792,7 @@
 
         # check whether we should update away
         if repo.unfiltered().revs('parents() and (%n  or %ln)',
-                                  state.parentctxnode, leafs):
+                                  state.parentctxnode, leafs | tmpnodes):
             hg.clean(repo, state.topmost)
         cleanupnode(ui, repo, 'created', tmpnodes)
         cleanupnode(ui, repo, 'temp', leafs)