equal
deleted
inserted
replaced
474 |
474 |
475 def stop(self, ui, repo): |
475 def stop(self, ui, repo): |
476 """logic to stop an interrupted transplant""" |
476 """logic to stop an interrupted transplant""" |
477 if self.canresume(): |
477 if self.canresume(): |
478 startctx = repo[b'.'] |
478 startctx = repo[b'.'] |
479 hg.updaterepo(repo, startctx.node(), overwrite=True) |
479 merge.clean_update(startctx) |
480 ui.status(_(b"stopped the interrupted transplant\n")) |
480 ui.status(_(b"stopped the interrupted transplant\n")) |
481 ui.status( |
481 ui.status( |
482 _(b"working directory is now at %s\n") % startctx.hex()[:12] |
482 _(b"working directory is now at %s\n") % startctx.hex()[:12] |
483 ) |
483 ) |
484 self.unlog() |
484 self.unlog() |