diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -352,7 +352,7 @@ def unshelveabort(ui, repo, state, opts) revertfiles = readshelvedfiles(repo, state.name) wctx = repo.parents()[0] cmdutil.revert(ui, repo, wctx, [wctx.node(), nullid], - *revertfiles, no_backup=True) + *revertfiles, **{'no_backup': True}) # fix up the weird dirstate states the merge left behind mf = wctx.manifest() dirstate = repo.dirstate @@ -514,7 +514,7 @@ def unshelve(ui, repo, *shelved, **opts) revertfiles = set(parents[1].files()).difference(ms) cmdutil.revert(ui, repo, parents[1], (parents[0].node(), nullid), - *revertfiles, no_backup=True) + *revertfiles, **{'no_backup': True}) raise error.InterventionRequired( _("unresolved conflicts (see 'hg resolve', then " "'hg unshelve --continue')")) @@ -523,7 +523,7 @@ def unshelve(ui, repo, *shelved, **opts) parent = tip.parents()[0] hg.update(repo, parent.node()) cmdutil.revert(ui, repo, tip, repo.dirstate.parents(), *tip.files(), - no_backup=True) + **{'no_backup': True}) prevquiet = ui.quiet ui.quiet = True