D3517: shelve: reduce scope of config override
yuja (Yuya Nishihara)
phabricator at mercurial-scm.org
Thu May 10 09:15:27 EDT 2018
yuja added a comment.
> + shelvectx = _rebaserestoredcommit(ui, repo, opts, tr, oldtiprev,
> + basename, pctx, tmpwctx,
> + shelvectx, branchtorestore,
> + activebookmark)
>
> overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
> with ui.configoverride(overrides, 'unshelve'):
Maybe I'm wrong, but doesn't rebase do merge?
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3517
To: martinvonz, #hg-reviewers
Cc: yuja, mercurial-devel
More information about the Mercurial-devel
mailing list