D3517: shelve: reduce scope of config override

Yuya Nishihara yuya at tcha.org
Thu May 10 09:15:04 EDT 2018


> +        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?


More information about the Mercurial-devel mailing list