##// END OF EJS Templates
config: replace experimental.stabilization by experimental.evolution...
Boris Feld -
r34866:a0100f34 default
parent child Browse files
Show More
@@ -2,7 +2,7 b''
2 > [extensions]
2 > [extensions]
3 > drawdag=$TESTDIR/drawdag.py
3 > drawdag=$TESTDIR/drawdag.py
4 > [experimental]
4 > [experimental]
5 > stabilization=all
5 > evolution=true
6 > EOF
6 > EOF
7
7
8 $ reinit () {
8 $ reinit () {
@@ -10,7 +10,7 b' Global setup'
10 > [phases]
10 > [phases]
11 > publish=False
11 > publish=False
12 > [experimental]
12 > [experimental]
13 > stabilization=all
13 > evolution=true
14 > [templates]
14 > [templates]
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
15 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}"
16 > obsfateverb = "{obsfateverb(successors)}"
16 > obsfateverb = "{obsfateverb(successors)}"
@@ -15,7 +15,7 b' Config setup'
15 >
15 >
16 > [experimental]
16 > [experimental]
17 > # enable evolution
17 > # enable evolution
18 > stabilization = all
18 > evolution=true
19 >
19 >
20 > # include obsmarkers in bundle
20 > # include obsmarkers in bundle
21 > stabilization.bundle-obsmarker = yes
21 > stabilization.bundle-obsmarker = yes
@@ -108,7 +108,7 b' A set of extension and shell functions e'
108 > [phases]
108 > [phases]
109 > publish = no
109 > publish = no
110 > [experimental]
110 > [experimental]
111 > stabilization = all
111 > evolution=true
112 > [alias]
112 > [alias]
113 > graph = log -G --rev 'sort(all(), "topo")'
113 > graph = log -G --rev 'sort(all(), "topo")'
114 > EOF
114 > EOF
@@ -397,7 +397,7 b' Test rebase with obsstore turned on and '
397 $ hg update E -q
397 $ hg update E -q
398 $ echo 3 > B
398 $ echo 3 > B
399 $ hg commit --amend -m E -A B -q
399 $ hg commit --amend -m E -A B -q
400 $ hg rebase -r B+D -d . --config experimental.stabilization=all
400 $ hg rebase -r B+D -d . --config experimental.evolution=true
401 rebasing 1:112478962961 "B" (B)
401 rebasing 1:112478962961 "B" (B)
402 merging B
402 merging B
403 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
403 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
@@ -408,7 +408,7 b' Test rebase with obsstore turned on and '
408 $ hg resolve -m
408 $ hg resolve -m
409 (no more unresolved files)
409 (no more unresolved files)
410 continue: hg rebase --continue
410 continue: hg rebase --continue
411 $ hg rebase --continue --config experimental.stabilization=none
411 $ hg rebase --continue --config experimental.evolution=none
412 rebasing 1:112478962961 "B" (B)
412 rebasing 1:112478962961 "B" (B)
413 rebasing 3:f585351a92f8 "D" (D)
413 rebasing 3:f585351a92f8 "D" (D)
414 warning: orphaned descendants detected, not stripping 112478962961
414 warning: orphaned descendants detected, not stripping 112478962961
@@ -116,7 +116,7 b' Setup rebase with multiple destinations'
116 > maprevset=$TESTTMP/maprevset.py
116 > maprevset=$TESTTMP/maprevset.py
117 > [experimental]
117 > [experimental]
118 > rebase.multidest=true
118 > rebase.multidest=true
119 > stabilization=all
119 > evolution=true
120 > EOF
120 > EOF
121
121
122 $ rebasewithdag() {
122 $ rebasewithdag() {
@@ -735,7 +735,7 b' Even when the chain include missing node'
735 |
735 |
736 o 0:4a2df7238c3b A
736 o 0:4a2df7238c3b A
737
737
738 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all
738 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
739 obsoleted 1 changesets
739 obsoleted 1 changesets
740 $ hg rebase -d 6 -r "4::"
740 $ hg rebase -d 6 -r "4::"
741 rebasing 4:ff2c4d47b71d "C"
741 rebasing 4:ff2c4d47b71d "C"
@@ -763,7 +763,7 b' should display a friendly error message'
763 $ hg add nonrelevant
763 $ hg add nonrelevant
764 $ hg commit -m nonrelevant
764 $ hg commit -m nonrelevant
765 created new head
765 created new head
766 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all
766 $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true
767 obsoleted 1 changesets
767 obsoleted 1 changesets
768 $ hg rebase -r . -d 10
768 $ hg rebase -r . -d 10
769 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
769 note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor
@@ -886,7 +886,7 b' Create the changes that we will rebase'
886 $ printf "dummy" > L
886 $ printf "dummy" > L
887 $ hg add L
887 $ hg add L
888 $ hg commit -m "dummy change"
888 $ hg commit -m "dummy change"
889 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.stabilization=all
889 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
890 obsoleted 1 changesets
890 obsoleted 1 changesets
891
891
892 $ hg log -G -r 16::
892 $ hg log -G -r 16::
@@ -1205,7 +1205,7 b' Test that bookmark is moved and working '
1205 equivalents in destination
1205 equivalents in destination
1206 $ hg init rbsrepo && cd rbsrepo
1206 $ hg init rbsrepo && cd rbsrepo
1207 $ echo "[experimental]" > .hg/hgrc
1207 $ echo "[experimental]" > .hg/hgrc
1208 $ echo "stabilization=all" >> .hg/hgrc
1208 $ echo "evolution=true" >> .hg/hgrc
1209 $ echo "rebaseskipobsolete=on" >> .hg/hgrc
1209 $ echo "rebaseskipobsolete=on" >> .hg/hgrc
1210 $ echo root > root && hg ci -Am root
1210 $ echo root > root && hg ci -Am root
1211 adding root
1211 adding root
@@ -968,7 +968,7 b' Testing rebase being called inside anoth'
968 > [extensions]
968 > [extensions]
969 > wraprebase=$TESTTMP/wraprebase.py
969 > wraprebase=$TESTTMP/wraprebase.py
970 > [experimental]
970 > [experimental]
971 > stabilization=all
971 > evolution=true
972 > EOF
972 > EOF
973
973
974 $ hg debugdrawdag <<'EOS'
974 $ hg debugdrawdag <<'EOS'
@@ -1280,7 +1280,7 b' we have reusable code here'
1280 $ cd $TESTTMP/scmutilcleanup.obsstore
1280 $ cd $TESTTMP/scmutilcleanup.obsstore
1281 $ cat >> .hg/hgrc <<EOF
1281 $ cat >> .hg/hgrc <<EOF
1282 > [experimental]
1282 > [experimental]
1283 > stabilization=all
1283 > evolution=true
1284 > stabilization.track-operation=1
1284 > stabilization.track-operation=1
1285 > EOF
1285 > EOF
1286
1286
@@ -1322,7 +1322,7 b' Test that obsmarkers are restored even w'
1322 $ cd issue5678
1322 $ cd issue5678
1323 $ cat >> .hg/hgrc <<EOF
1323 $ cat >> .hg/hgrc <<EOF
1324 > [experimental]
1324 > [experimental]
1325 > evolution=all
1325 > evolution=true
1326 > EOF
1326 > EOF
1327 $ echo a > a
1327 $ echo a > a
1328 $ hg ci -Aqm a
1328 $ hg ci -Aqm a
@@ -26,7 +26,7 b' publish=False'
26 # reduce output changes
26 # reduce output changes
27 bundle2-output-capture=True
27 bundle2-output-capture=True
28 # enable evolution
28 # enable evolution
29 evolution=all
29 evolution=true
30
30
31 [extensions]
31 [extensions]
32 # we need to strip some changeset for some test cases
32 # we need to strip some changeset for some test cases
General Comments 0
You need to be logged in to leave comments. Login now