equal
deleted
inserted
replaced
425 # merge state clean-up path doesn't happen, so do it |
425 # merge state clean-up path doesn't happen, so do it |
426 # here. Fix issue5494 |
426 # here. Fix issue5494 |
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 with repo.dirstate.parentchange(): |
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: |
435 self.state[rev] = repo[newnode].rev() |
434 self.state[rev] = repo[newnode].rev() |
436 ui.debug('rebased as %s\n' % short(newnode)) |
435 ui.debug('rebased as %s\n' % short(newnode)) |