##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: preserve working copy when redoing in-mem rebase on disk...
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
Martin von Zweigbergk -
r40835:f07d4f94 stable
Show More
Name Size Modified Last Commit Author
/ mercurial / cext
__init__.py Loading ...
base85.c Loading ...
bdiff.c Loading ...
charencode.c Loading ...
charencode.h Loading ...
dirs.c Loading ...
manifest.c Loading ...
mpatch.c Loading ...
osutil.c Loading ...
parsers.c Loading ...
pathencode.c Loading ...
revlog.c Loading ...
util.h Loading ...