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, @@ -660,7 +657,6 @@ 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): @@ -743,7 +739,6 @@ if repo.vfs.exists('unshelverebasestate'): repo.vfs.rename('unshelverebasestate', 'rebasestate') - rebase.clearstatus(repo) mergefiles(ui, repo, state.wctx, shelvectx) restorebranch(ui, repo, state.branchtorestore)