Show More
@@ -427,9 +427,8 b' class rebaseruntime(object):' | |||
|
427 | 427 | mergemod.mergestate.clean(repo) |
|
428 | 428 | else: |
|
429 | 429 | # Skip commit if we are collapsing |
|
430 |
repo.dirstate. |
|
|
431 | repo.setparents(repo[p1].node()) | |
|
432 | repo.dirstate.endparentchange() | |
|
430 | with repo.dirstate.parentchange(): | |
|
431 | repo.setparents(repo[p1].node()) | |
|
433 | 432 | newnode = None |
|
434 | 433 | # Update the state |
|
435 | 434 | if newnode is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now