Skip to content
Snippets Groups Projects
Commit 8dc45c90 authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

rebase: always store rev in state, also when collapsing

parent 2e047b15
No related branches found
No related tags found
No related merge requests found
......@@ -429,5 +429,9 @@
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:
......@@ -432,6 +436,6 @@
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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment