Mercurial > hg > mercurial-source
changeset 33377:517841766994
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 | e4d0b2efb8b5 |
children | 9e46627baa3c |
files | hgext/rebase.py |
diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -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: