Skip to content
Snippets Groups Projects
Commit f07d4f94 authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

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
parent 8ff910b2
Branches
Tags
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment