--- a/hgext/rebase.py	Mon Nov 04 19:59:00 2013 -0800
+++ b/hgext/rebase.py	Fri Nov 01 17:08:06 2013 -0700
@@ -346,6 +346,9 @@
                 commitmsg = ui.edit(commitmsg, repo.ui.username())
             newrev = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
                                   extrafn=extrafn, editor=editor)
+            for oldrev in state.iterkeys():
+                if state[oldrev] > nullmerge:
+                    state[oldrev] = newrev
 
         if 'qtip' in repo.tags():
             updatemq(repo, state, skipped, **opts)