D3517: shelve: reduce scope of config override
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu May 10 15:20:28 UTC 2018
martinvonz added a comment.
In https://phab.mercurial-scm.org/D3517#55774, @yuja wrote:
> > + 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?
Correct, but we seem to be passing the tool explicitly to the rebase command on line 755. I had checked this before, and should have mentioned it in the commit message. Sorry.
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