Mercurial > hg

diff hgext/rebase.py @ 32594:517841766994

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: drop unnecessary parentchange call We're calling localrepo.setparents here, not dirstate.setparents. localrepo.setparents calls dirstate.parentchange already.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 31 May 2017 19:46:04 -0700
parents 47e4c6bb39f1
children 07d5a503124c
line wrap: on
line diff
--- a/hgext/rebase.py	Tue May 30 13:16:32 2017 -0700
+++ b/hgext/rebase.py	Wed May 31 19:46:04 2017 -0700
@@ -427,8 +427,7 @@
                         mergemod.mergestate.clean(repo)
                 else:
                     # Skip commit if we are collapsing
-                    with repo.dirstate.parentchange():
-                        repo.setparents(repo[p1].node())
+                    repo.setparents(repo[p1].node())
                     newnode = None
                 # Update the state
                 if newnode is not None: