.arcconfig
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 30 Nov 2018 16:21:37 -0800
branchstable
changeset 40790 f07d4f94f098
parent 33583 b2c27d84f05c
child 44128 ff396501e841
permissions -rw-r--r--
rebase: preserve working copy when redoing in-mem rebase on disk When in-memory rebase runs into conflicts, we retry it on disk. But before we do that, we abort the in-memory rebase. That is done because even though it's mostly in memory, there are still a few state files written (e.g. the merge state). We should make it not write those files so we don't need to abort, but for the stable branch, let's explicitly clear the state we need to clear instead of running the usual abort code. Differential Revision: https://phab.mercurial-scm.org/D5356

{
    "conduit_uri": "https://phab.mercurial-scm.org/api",
    "repository.callsign": "HG",
    "arc.land.onto.default": "@",
    "base": "hg:.^"
}