--- a/hgext/rebase.py Thu Jan 17 17:51:30 2013 +0100
+++ b/hgext/rebase.py Fri Jan 18 14:15:32 2013 +0100
@@ -312,7 +312,7 @@
collapsedas = None
if collapsef:
collapsedas = newrev
- clearrebased(ui, repo, state, collapsedas)
+ clearrebased(ui, repo, state, skipped, collapsedas)
if currentbookmarks:
updatebookmarks(repo, nstate, currentbookmarks, **opts)
@@ -660,7 +660,7 @@
state[r] = nullmerge
return repo['.'].rev(), dest.rev(), state
-def clearrebased(ui, repo, state, collapsedas=None):
+def clearrebased(ui, repo, state, skipped, collapsedas=None):
"""dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the
@@ -669,9 +669,13 @@
markers = []
for rev, newrev in sorted(state.items()):
if newrev >= 0:
- if collapsedas is not None:
- newrev = collapsedas
- markers.append((repo[rev], (repo[newrev],)))
+ if rev in skipped:
+ succs = ()
+ elif collapsedas is not None:
+ succs = (repo[collapsedas],)
+ else:
+ succs = (repo[newrev],)
+ markers.append((repo[rev], succs))
if markers:
obsolete.createmarkers(repo, markers)
else: