Mercurial > public > mercurial-scm > hg
diff mercurial/shelve.py @ 42702:4814d993fe21
unshelve: handle stripping changesets on interactive mode
On interactive mode, changesets on `nodestoremove` should be
stripped regardless of the shelve is partial or not. This patch
modifies `unshelvecontinue()` to do that.
Differential Revision: https://phab.mercurial-scm.org/D6686
| author | Navaneeth Suresh <navaneeths1998@gmail.com> |
|---|---|
| date | Wed, 24 Jul 2019 18:15:27 +0530 |
| parents | 52a383451739 |
| children | 073cfff9aaef |
line wrap: on
line diff
--- a/mercurial/shelve.py Tue Aug 06 14:54:25 2019 +0200 +++ b/mercurial/shelve.py Wed Jul 24 18:15:27 2019 +0530 @@ -747,10 +747,10 @@ mergefiles(ui, repo, state.wctx, shelvectx) restorebranch(ui, repo, state.branchtorestore) + if not phases.supportinternal(repo): + repair.strip(ui, repo, state.nodestoremove, backup=False, + topic='shelve') if not ispartialunshelve: - if not phases.supportinternal(repo): - repair.strip(ui, repo, state.nodestoremove, backup=False, - topic='shelve') shelvedstate.clear(repo) unshelvecleanup(ui, repo, state.name, opts) _restoreactivebookmark(repo, state.activebookmark)