##// END OF EJS Templates
rebase: migrate to context manager for changing dirstate parents
Augie Fackler -
r32348:082fc4ab default
parent child Browse files
Show More
@@ -427,9 +427,8 b' class rebaseruntime(object):'
427 mergemod.mergestate.clean(repo)
427 mergemod.mergestate.clean(repo)
428 else:
428 else:
429 # Skip commit if we are collapsing
429 # Skip commit if we are collapsing
430 repo.dirstate.beginparentchange()
430 with repo.dirstate.parentchange():
431 repo.setparents(repo[p1].node())
431 repo.setparents(repo[p1].node())
432 repo.dirstate.endparentchange()
433 newnode = None
432 newnode = None
434 # Update the state
433 # Update the state
435 if newnode is not None:
434 if newnode is not None:
General Comments 0
You need to be logged in to leave comments. Login now