Mercurial > hg-stable
changeset 34870:64f29fff1877
config: rename stabilization.track-operation
We want to get rid of stabilization.* configuration, back out to the old
configuration 'evolution.track-operation'.
Differential Revision: https://phab.mercurial-scm.org/D1153
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 17 Oct 2017 15:56:49 +0200 |
| parents | 196548113ddd |
| children | 28fd13076962 |
| files | tests/test-histedit-obsolete.t tests/test-obsolete.t tests/test-rebase-obsolete.t tests/test-strip.t |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-histedit-obsolete.t Tue Oct 17 15:54:05 2017 +0200 +++ b/tests/test-histedit-obsolete.t Tue Oct 17 15:56:49 2017 +0200 @@ -545,7 +545,7 @@ | o 0:cb9a9f314b8b (public) a - $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.stabilization.track-operation=1 + $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1 > pick b449568bf7fc 13 f > pick 7395e1ff83bd 15 h > pick 6b70183d2492 14 g @@ -556,7 +556,7 @@ Editing (ee118ab9fa44), you may commit or record as needed now. (hg histedit --continue to resume) [1] - $ hg histedit --continue --config experimental.stabilization.track-operation=1 + $ hg histedit --continue --config experimental.evolution.track-operation=1 $ hg log -G @ 23:175d6b286a22 (secret) k |
--- a/tests/test-obsolete.t Tue Oct 17 15:54:05 2017 +0200 +++ b/tests/test-obsolete.t Tue Oct 17 15:56:49 2017 +0200 @@ -1442,7 +1442,7 @@ $ echo d > d $ hg ci -Am d adding d - $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 + $ hg ci --amend -m dd --config experimental.evolution.track-operation=1 $ hg debugobsolete --index --rev "3+7" 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re)
--- a/tests/test-rebase-obsolete.t Tue Oct 17 15:54:05 2017 +0200 +++ b/tests/test-rebase-obsolete.t Tue Oct 17 15:56:49 2017 +0200 @@ -1225,7 +1225,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.stabilization.track-operation=1 + $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) Check that working directory and bookmark was updated to rev 3 although rev 2 was skipped
--- a/tests/test-strip.t Tue Oct 17 15:54:05 2017 +0200 +++ b/tests/test-strip.t Tue Oct 17 15:56:49 2017 +0200 @@ -1281,7 +1281,7 @@ $ cat >> .hg/hgrc <<EOF > [experimental] > evolution=true - > stabilization.track-operation=1 + > evolution.track-operation=1 > EOF $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py