##// END OF EJS Templates
rebase: reorder parent check and state storage...
Matt Mackall -
r19477:e9351f0d stable
parent child Browse files
Show More
@@ -258,10 +258,10 b' def rebase(ui, repo, **opts):'
258 if state[rev] == -1:
258 if state[rev] == -1:
259 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
259 ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])),
260 _('changesets'), total)
260 _('changesets'), total)
261 p1, p2 = defineparents(repo, rev, target, state,
262 targetancestors)
261 storestatus(repo, originalwd, target, state, collapsef, keepf,
263 storestatus(repo, originalwd, target, state, collapsef, keepf,
262 keepbranchesf, external, activebookmark)
264 keepbranchesf, external, activebookmark)
263 p1, p2 = defineparents(repo, rev, target, state,
264 targetancestors)
265 if len(repo.parents()) == 2:
265 if len(repo.parents()) == 2:
266 repo.ui.debug('resuming interrupted rebase\n')
266 repo.ui.debug('resuming interrupted rebase\n')
267 else:
267 else:
General Comments 0
You need to be logged in to leave comments. Login now