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
Testing cloning with the EOL extension
$ cat >> $HGRCPATH <<EOF
> [extensions]
> eol =
>
> [eol]
> native = CRLF
> EOF
setup repository
$ hg init repo
$ cd repo
$ cat > .hgeol <<EOF
> [patterns]
> **.txt = native
> EOF
$ printf "first\r\nsecond\r\nthird\r\n" > a.txt
$ hg commit --addremove -m 'checkin'
adding .hgeol
adding a.txt
Clone
$ cd ..
$ hg clone repo repo-2
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-2
$ cat a.txt
first\r (esc)
second\r (esc)
third\r (esc)
$ hg cat a.txt
first
second
third
$ hg remove .hgeol
$ hg commit -m 'remove eol'
$ hg push --quiet
$ cd ..
Test clone of repo with .hgeol in working dir, but no .hgeol in tip
$ hg clone repo repo-3
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-3
$ cat a.txt
first
second
third
Test clone of revision with .hgeol
$ cd ..
$ hg clone -r 0 repo repo-4
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
new changesets 90f94e2cf4e2
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-4
$ cat .hgeol
[patterns]
**.txt = native
$ cat a.txt
first\r (esc)
second\r (esc)
third\r (esc)
$ cd ..