changeset 32594 | 517841766994 |
parent 32586 | 47e4c6bb39f1 |
child 32900 | 07d5a503124c |
--- 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: