Show More
@@ -427,8 +427,7 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 |
|
|
430 | repo.setparents(repo[p1].node()) | |
431 | repo.setparents(repo[p1].node()) |
|
|||
432 | newnode = None |
|
431 | newnode = None | |
433 | # Update the state |
|
432 | # Update the state | |
434 | if newnode is not None: |
|
433 | if newnode is not None: |
General Comments 0
You need to be logged in to leave comments.
Login now