diff --git a/hgext/rebase.py b/hgext/rebase.py index 4fed15d4c5aad72cb9ee7ddf9951ce243ddfcf1f_aGdleHQvcmViYXNlLnB5..e9351f0d9a2ab6696322bd69194c82ec4359285a_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -258,5 +258,7 @@ if state[rev] == -1: ui.progress(_("rebasing"), pos, ("%d:%s" % (rev, repo[rev])), _('changesets'), total) + p1, p2 = defineparents(repo, rev, target, state, + targetancestors) storestatus(repo, originalwd, target, state, collapsef, keepf, keepbranchesf, external, activebookmark) @@ -261,7 +263,5 @@ storestatus(repo, originalwd, target, state, collapsef, keepf, keepbranchesf, external, activebookmark) - p1, p2 = defineparents(repo, rev, target, state, - targetancestors) if len(repo.parents()) == 2: repo.ui.debug('resuming interrupted rebase\n') else: