Mercurial > public > mercurial-scm > hg-stable
diff tests/test-copies-in-changeset.t @ 46436:24a32dea6955
rebase: add a config knob for forcing in-memory rebasing
Use it in a test case where we know the rebase should proceed without
incident in-memory, so we can see tracebacks rather than
fallbacks. This makes it easier to try and debug when things are
broken.
Differential Revision: https://phab.mercurial-scm.org/D8623
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 28 May 2020 17:31:41 -0400 |
| parents | 6e81446bf1d9 |
| children | fd55a9eb1507 |
line wrap: on
line diff
--- a/tests/test-copies-in-changeset.t Mon May 18 17:29:53 2020 -0400 +++ b/tests/test-copies-in-changeset.t Thu May 28 17:31:41 2020 -0400 @@ -345,7 +345,10 @@ $ hg co -q 0 $ hg mv a b $ hg ci -qm 'rename a to b' - $ hg rebase -d 1 --config rebase.experimental.inmemory=yes +Not only do we want this to run in-memory, it shouldn't fall back to +on-disk merge (no conflicts), so we force it to be in-memory +with no fallback. + $ hg rebase -d 1 --config rebase.experimental.inmemory=yes --config devel.rebase.force-in-memory-merge=yes rebasing 2:* tip "rename a to b" (glob) merging a and b to b saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob)