Mercurial > public > mercurial-scm > hg-stable

diff mercurial/shelve.py @ 42750:d684449eef67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: forget unknown files after a partial unshelve This is a follow-up patch to 6957f7b93e03. This allows hg to forget unknown files after a partial unshelve. Differential Revision: https://phab.mercurial-scm.org/D6724
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Tue, 13 Aug 2019 22:48:05 +0530
parents 6957f7b93e03
children 5c285c8e4f98
line wrap: on
line diff
--- a/mercurial/shelve.py	Thu Aug 08 01:59:43 2019 +0200
+++ b/mercurial/shelve.py	Tue Aug 13 22:48:05 2019 +0530
@@ -1005,8 +1005,8 @@
         restorebranch(ui, repo, branchtorestore)
         shelvedstate.clear(repo)
         _finishunshelve(repo, oldtiprev, tr, activebookmark)
+        _forgetunknownfiles(repo, shelvectx, addedbefore)
         if not ispartialunshelve:
-            _forgetunknownfiles(repo, shelvectx, addedbefore)
             unshelvecleanup(ui, repo, basename, opts)
     finally:
         if tr: