Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rebase-inmemory.t @ 35396:dd11df900f7f
rebase: replace --inmemory flag with rebase.experimental.inmemory config
Differential Revision: https://phab.mercurial-scm.org/D1666
author | Phil Cohen <phillco@fb.com> |
---|---|
date | Mon, 11 Dec 2017 22:16:13 -0800 |
parents | b9bdee046cc2 |
children | 795eb53f1d3e |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Mon Dec 11 09:37:11 2017 -0500 +++ b/tests/test-rebase-inmemory.t Mon Dec 11 22:16:13 2017 -0800 @@ -4,6 +4,8 @@ > amend= > rebase= > debugdrawdag=$TESTDIR/drawdag.py + > [rebase] + > experimental.inmemory=1 > [diff] > git=1 > [alias] @@ -35,7 +37,7 @@ c (no-eol) $ hg cat -r 2 b b (no-eol) - $ hg rebase --inmemory --debug -r b -d c | grep rebasing + $ hg rebase --debug -r b -d c | grep rebasing rebasing in-memory rebasing 2:db0e82a16a62 "b" (b) $ hg tglog @@ -94,7 +96,7 @@ b (no-eol) $ hg cat -r 3 e somefile (no-eol) - $ hg rebase --inmemory --debug -s b -d a | grep rebasing + $ hg rebase --debug -s b -d a | grep rebasing rebasing in-memory rebasing 2:db0e82a16a62 "b" (b) $ hg tglog @@ -110,7 +112,7 @@ c (no-eol) $ hg cat -r 3 b b (no-eol) - $ hg rebase --inmemory --debug -s 1 -d 3 | grep rebasing + $ hg rebase --debug -s 1 -d 3 | grep rebasing rebasing in-memory rebasing 1:02952614a83d "d" (d) rebasing 2:f56b71190a8f "c" @@ -142,7 +144,7 @@ we requested in-memory. $ hg up -C 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg rebase -r 3 -d 0 --inmemory --debug | grep rebasing + $ hg rebase -r 3 -d 0 --debug | grep rebasing rebasing on disk rebasing 3:753feb6fd12a "c" (tip) $ hg tglog