equal
deleted
inserted
replaced
654 """subcommand that abort an in-progress unshelve""" |
654 """subcommand that abort an in-progress unshelve""" |
655 with repo.lock(): |
655 with repo.lock(): |
656 try: |
656 try: |
657 checkparents(repo, state) |
657 checkparents(repo, state) |
658 |
658 |
659 merge.update(repo, state.pendingctx, False, True) |
659 merge.update(repo, state.pendingctx, branchmerge=False, force=True) |
660 if (state.activebookmark |
660 if (state.activebookmark |
661 and state.activebookmark in repo._bookmarks): |
661 and state.activebookmark in repo._bookmarks): |
662 bookmarks.activate(repo, state.activebookmark) |
662 bookmarks.activate(repo, state.activebookmark) |
663 |
663 |
664 if repo.vfs.exists('unshelverebasestate'): |
664 if repo.vfs.exists('unshelverebasestate'): |