Comments
Patch
@@ -1239,6 +1239,7 @@
> y
> EOF
unshelving change 'default'
+ temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes
diff --git a/d b/d
new file mode 100644
@@ -1001,11 +1001,10 @@
with ui.configoverride(overrides, 'unshelve'):
mergefiles(ui, repo, pctx, shelvectx)
restorebranch(ui, repo, branchtorestore)
+ shelvedstate.clear(repo)
+ _finishunshelve(repo, oldtiprev, tr, activebookmark)
if not ispartialunshelve:
_forgetunknownfiles(repo, shelvectx, addedbefore)
-
- shelvedstate.clear(repo)
- _finishunshelve(repo, oldtiprev, tr, activebookmark)
unshelvecleanup(ui, repo, basename, opts)
finally:
if tr: