comparison mercurial/namespaces.py @ 35332:03bec089e105

rebase: disable `inmemory` if the rebaseset contains the working copy As described in the comment, rebasing the working copy parent with in-memory merge, and then updating to the new commit, isn't much faster because of the extra overhead of uppdating. Best to leave it off in that case. This commit makes deploying in-memory merge via an extension easier, because you can just set `inmemory=True` based on some config or probability, and this will turn off the cases where it's not desired. Differential Revision: https://phab.mercurial-scm.org/D1616
author Phil Cohen <phillco@fb.com>
date Fri, 08 Dec 2017 15:27:58 -0800
parents c7b45db8f317
children b0054f3c055a
comparison
equal deleted inserted replaced
35331:773a9a06047c 35332:03bec089e105