diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -54,9 +54,6 @@ vfs as vfsmod, ) -from . import ( - rebase, -) from mercurial.utils import ( dateutil, stringutil, @@ -657,11 +654,6 @@ if (state.activebookmark and state.activebookmark in repo._bookmarks): bookmarks.activate(repo, state.activebookmark) - - if repo.vfs.exists('unshelverebasestate'): - repo.vfs.rename('unshelverebasestate', 'rebasestate') - rebase.clearstatus(repo) - mergefiles(ui, repo, state.wctx, state.pendingctx) if not phases.supportinternal(repo): repair.strip(ui, repo, state.nodestoremove, backup=False, @@ -740,11 +732,6 @@ shelvectx = repo[newnode] hg.updaterepo(repo, pendingctx.node(), overwrite=False) - - if repo.vfs.exists('unshelverebasestate'): - repo.vfs.rename('unshelverebasestate', 'rebasestate') - rebase.clearstatus(repo) - mergefiles(ui, repo, state.wctx, shelvectx) restorebranch(ui, repo, state.branchtorestore)