# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1417493579 -3600
# Node ID 8dc45c905989891b0cc075809344268427b95e92
# Parent  2e047b1558a5ba399c18b24df4833d1b1bacabe6
rebase: always store rev in state, also when collapsing

diff -r 2e047b1558a5 -r 8dc45c905989 hgext/rebase.py
--- a/hgext/rebase.py	Tue Dec 02 05:12:53 2014 +0100
+++ b/hgext/rebase.py	Tue Dec 02 05:12:59 2014 +0100
@@ -429,9 +429,13 @@
             editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
             newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg,
                                    extrafn=extrafn, editor=editor)
+            if newnode is None:
+                newrev = target
+            else:
+                newrev = repo[newnode].rev()
             for oldrev in state.iterkeys():
                 if state[oldrev] > nullmerge:
-                    state[oldrev] = newnode
+                    state[oldrev] = newrev
 
         if 'qtip' in repo.tags():
             updatemq(repo, state, skipped, **opts)