# HG changeset patch # User Siddharth Agarwal # Date 1496285164 25200 # Node ID 5178417669948ed6e7813e1c12cb52643aecb015 # Parent e4d0b2efb8b5aea10d1880d602c7d7b3a32c25a3 rebase: drop unnecessary parentchange call We're calling localrepo.setparents here, not dirstate.setparents. localrepo.setparents calls dirstate.parentchange already. diff -r e4d0b2efb8b5 -r 517841766994 hgext/rebase.py --- 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: