Mercurial > hg

changeset 23460:8dc45c905989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: always store rev in state, also when collapsing
author Mads Kiilerich <madski@unity3d.com>
date Tue, 02 Dec 2014 05:12:59 +0100
parents 2e047b1558a5
children ffef6d503ab2
files hgext/rebase.py
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)