Mercurial > hg
diff tests/test-rebase-obsolete.t @ 33773:6c1a9fd8361b
test: update evolution config
evolution* config has been rewritten in stabilization* in the previous patch,
update tests file to use the new names.
Differential Revision: https://phab.mercurial-scm.org/D249
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Fri, 04 Aug 2017 18:41:16 +0200 |
parents | 2194a8723138 |
children | f078d7358e90 |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Thu Aug 03 11:38:22 2017 +0200 +++ b/tests/test-rebase-obsolete.t Fri Aug 04 18:41:16 2017 +0200 @@ -8,7 +8,7 @@ > [ui] > logtemplate= {rev}:{node|short} {desc|firstline} > [experimental] - > evolution=createmarkers,allowunstable + > stabilization=createmarkers,allowunstable > [phases] > publish=False > [extensions] @@ -732,7 +732,7 @@ | o 0:4a2df7238c3b A - $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=all + $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all obsoleted 1 changesets $ hg rebase -d 6 -r "4::" rebasing 4:ff2c4d47b71d "C" @@ -760,7 +760,7 @@ $ hg add nonrelevant $ hg commit -m nonrelevant created new head - $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=all + $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all obsoleted 1 changesets $ hg rebase -r . -d 10 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor @@ -885,7 +885,7 @@ $ printf "dummy" > L $ hg add L $ hg commit -m "dummy change" - $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.evolution=all + $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.stabilization=all obsoleted 1 changesets $ hg log -G -r 17:: @@ -1121,7 +1121,7 @@ equivalents in destination $ hg init rbsrepo && cd rbsrepo $ echo "[experimental]" > .hg/hgrc - $ echo "evolution=all" >> .hg/hgrc + $ echo "stabilization=all" >> .hg/hgrc $ echo "rebaseskipobsolete=on" >> .hg/hgrc $ echo root > root && hg ci -Am root adding root @@ -1140,7 +1140,7 @@ $ hg up 2 && hg log -r . # working dir is at rev 2 again 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 2:1e9a3c00cbe9 b (no-eol) - $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 + $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" Check that working directory was updated to rev 3 although rev 2 was skipped during the rebase operation