Mercurial > hg
comparison tests/test-copies-in-changeset.t @ 46362: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 | 4b0192f592cf |
children | fd55a9eb1507 |
comparison
equal
deleted
inserted
replaced
46361:dfca84970da8 | 46362:24a32dea6955 |
---|---|
343 $ echo a2 > a | 343 $ echo a2 > a |
344 $ hg ci -m 'modify a' | 344 $ hg ci -m 'modify a' |
345 $ hg co -q 0 | 345 $ hg co -q 0 |
346 $ hg mv a b | 346 $ hg mv a b |
347 $ hg ci -qm 'rename a to b' | 347 $ hg ci -qm 'rename a to b' |
348 $ hg rebase -d 1 --config rebase.experimental.inmemory=yes | 348 Not only do we want this to run in-memory, it shouldn't fall back to |
349 on-disk merge (no conflicts), so we force it to be in-memory | |
350 with no fallback. | |
351 $ hg rebase -d 1 --config rebase.experimental.inmemory=yes --config devel.rebase.force-in-memory-merge=yes | |
349 rebasing 2:* tip "rename a to b" (glob) | 352 rebasing 2:* tip "rename a to b" (glob) |
350 merging a and b to b | 353 merging a and b to b |
351 saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) | 354 saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/*-*-rebase.hg (glob) |
352 $ hg st --change . --copies | 355 $ hg st --change . --copies |
353 A b | 356 A b |