Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: reorder parent check and state storage stable
authorMatt Mackall <mpm@selenic.com>
Wed, 24 Jul 2013 23:51:44 -0500
branchstable
changeset 19477 e9351f0d9a2a
parent 19476 4fed15d4c5aa
child 19478 e5a5790a3185
rebase: reorder parent check and state storage This could cause a rebase to be 'in progress' even though it aborted.
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Wed Jul 24 23:51:40 2013 -0500
+++ b/hgext/rebase.py	Wed Jul 24 23:51:44 2013 -0500
@@ -258,10 +258,10 @@
             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)
-                p1, p2 = defineparents(repo, rev, target, state,
-                                                        targetancestors)
                 if len(repo.parents()) == 2:
                     repo.ui.debug('resuming interrupted rebase\n')
                 else:
Mercurial