Show More
@@ -11,7 +11,7 b'' | |||||
11 | #if obsstore-on |
|
11 | #if obsstore-on | |
12 | $ cat << EOF >> $HGRCPATH |
|
12 | $ cat << EOF >> $HGRCPATH | |
13 | > [experimental] |
|
13 | > [experimental] | |
14 |
> |
|
14 | > stabilization=createmarkers | |
15 | > EOF |
|
15 | > EOF | |
16 | #endif |
|
16 | #endif | |
17 |
|
17 | |||
@@ -176,7 +176,7 b' With allowunstable, amend could work in ' | |||||
176 |
|
176 | |||
177 | $ cat >> $HGRCPATH <<EOF |
|
177 | $ cat >> $HGRCPATH <<EOF | |
178 | > [experimental] |
|
178 | > [experimental] | |
179 |
> |
|
179 | > stabilization=createmarkers, allowunstable | |
180 | > EOF |
|
180 | > EOF | |
181 |
|
181 | |||
182 | $ hg amend |
|
182 | $ hg amend |
@@ -574,7 +574,7 b' Check that bisect does not break on obso' | |||||
574 |
|
574 | |||
575 | $ cat >> $HGRCPATH << EOF |
|
575 | $ cat >> $HGRCPATH << EOF | |
576 | > [experimental] |
|
576 | > [experimental] | |
577 |
> |
|
577 | > stabilization=createmarkers | |
578 | > EOF |
|
578 | > EOF | |
579 |
|
579 | |||
580 | tip is obsolete |
|
580 | tip is obsolete |
@@ -6,7 +6,7 b'' | |||||
6 | > [phases] |
|
6 | > [phases] | |
7 | > publish=False |
|
7 | > publish=False | |
8 | > [experimental] |
|
8 | > [experimental] | |
9 |
> |
|
9 | > stabilization=createmarkers,exchange | |
10 | > EOF |
|
10 | > EOF | |
11 |
|
11 | |||
12 | initialize |
|
12 | initialize |
@@ -15,7 +15,7 b' enable obsolescence' | |||||
15 |
|
15 | |||
16 | $ cat >> $HGRCPATH << EOF |
|
16 | $ cat >> $HGRCPATH << EOF | |
17 | > [experimental] |
|
17 | > [experimental] | |
18 |
> |
|
18 | > stabilization=createmarkers,exchange | |
19 | > bundle2-output-capture=True |
|
19 | > bundle2-output-capture=True | |
20 | > [ui] |
|
20 | > [ui] | |
21 | > ssh="$PYTHON" "$TESTDIR/dummyssh" |
|
21 | > ssh="$PYTHON" "$TESTDIR/dummyssh" |
@@ -227,7 +227,7 b' Create an extension to test bundle2 API' | |||||
227 | > [extensions] |
|
227 | > [extensions] | |
228 | > bundle2=$TESTTMP/bundle2.py |
|
228 | > bundle2=$TESTTMP/bundle2.py | |
229 | > [experimental] |
|
229 | > [experimental] | |
230 |
> |
|
230 | > stabilization=createmarkers | |
231 | > [ui] |
|
231 | > [ui] | |
232 | > ssh=$PYTHON "$TESTDIR/dummyssh" |
|
232 | > ssh=$PYTHON "$TESTDIR/dummyssh" | |
233 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
|
233 | > logtemplate={rev}:{node|short} {phase} {author} {bookmarks} {desc|firstline} |
@@ -2,7 +2,7 b' Enable obsolete markers' | |||||
2 |
|
2 | |||
3 | $ cat >> $HGRCPATH << EOF |
|
3 | $ cat >> $HGRCPATH << EOF | |
4 | > [experimental] |
|
4 | > [experimental] | |
5 |
> |
|
5 | > stabilization=createmarkers | |
6 | > [phases] |
|
6 | > [phases] | |
7 | > publish=False |
|
7 | > publish=False | |
8 | > EOF |
|
8 | > EOF |
@@ -706,7 +706,7 b' Create repositories to test auto sharing' | |||||
706 | $ cd filteredrev0 |
|
706 | $ cd filteredrev0 | |
707 | $ cat >> .hg/hgrc << EOF |
|
707 | $ cat >> .hg/hgrc << EOF | |
708 | > [experimental] |
|
708 | > [experimental] | |
709 |
> |
|
709 | > stabilization=createmarkers | |
710 | > EOF |
|
710 | > EOF | |
711 | $ echo initial1 > foo |
|
711 | $ echo initial1 > foo | |
712 | $ hg -q commit -A -m initial0 |
|
712 | $ hg -q commit -A -m initial0 |
@@ -3567,7 +3567,7 b' Test shortest(node) with the repo having' | |||||
3567 | $ cd hashcollision |
|
3567 | $ cd hashcollision | |
3568 | $ cat <<EOF >> .hg/hgrc |
|
3568 | $ cat <<EOF >> .hg/hgrc | |
3569 | > [experimental] |
|
3569 | > [experimental] | |
3570 |
> |
|
3570 | > stabilization = createmarkers | |
3571 | > EOF |
|
3571 | > EOF | |
3572 | $ echo 0 > a |
|
3572 | $ echo 0 > a | |
3573 | $ hg ci -qAm 0 |
|
3573 | $ hg ci -qAm 0 |
@@ -497,7 +497,7 b' changelog and manifest would have invali' | |||||
497 |
|
497 | |||
498 | $ cat >> .hg/hgrc << EOF |
|
498 | $ cat >> .hg/hgrc << EOF | |
499 | > [experimental] |
|
499 | > [experimental] | |
500 |
> |
|
500 | > stabilization=createmarkers | |
501 | > EOF |
|
501 | > EOF | |
502 |
|
502 | |||
503 | >>> import os |
|
503 | >>> import os |
@@ -520,7 +520,7 b' Enable obsolete' | |||||
520 |
|
520 | |||
521 | $ cat >> $HGRCPATH << EOF |
|
521 | $ cat >> $HGRCPATH << EOF | |
522 | > [experimental] |
|
522 | > [experimental] | |
523 |
> |
|
523 | > stabilization=createmarkers,allowunstable | |
524 | > EOF |
|
524 | > EOF | |
525 |
|
525 | |||
526 | Amend with no files changes |
|
526 | Amend with no files changes |
@@ -2,7 +2,7 b'' | |||||
2 | > [extensions] |
|
2 | > [extensions] | |
3 | > drawdag=$TESTDIR/drawdag.py |
|
3 | > drawdag=$TESTDIR/drawdag.py | |
4 | > [experimental] |
|
4 | > [experimental] | |
5 |
> |
|
5 | > stabilization=all | |
6 | > EOF |
|
6 | > EOF | |
7 |
|
7 | |||
8 | $ reinit () { |
|
8 | $ reinit () { |
@@ -2290,7 +2290,7 b' Test --hidden' | |||||
2290 |
|
2290 | |||
2291 | $ cat >> $HGRCPATH << EOF |
|
2291 | $ cat >> $HGRCPATH << EOF | |
2292 | > [experimental] |
|
2292 | > [experimental] | |
2293 |
> |
|
2293 | > stabilization=createmarkers | |
2294 | > EOF |
|
2294 | > EOF | |
2295 |
|
2295 | |||
2296 | $ hg debugobsolete `hg id --debug -i -r 8` |
|
2296 | $ hg debugobsolete `hg id --debug -i -r 8` |
@@ -494,7 +494,7 b' amend should not be blocked by the ongoi' | |||||
494 |
|
494 | |||
495 | $ cat >>$HGRCPATH <<EOF |
|
495 | $ cat >>$HGRCPATH <<EOF | |
496 | > [experimental] |
|
496 | > [experimental] | |
497 |
> |
|
497 | > stabilization=createmarkers,allowunstable | |
498 | > EOF |
|
498 | > EOF | |
499 | $ hg commit --amend -m 'allow this fold' |
|
499 | $ hg commit --amend -m 'allow this fold' | |
500 | $ hg histedit --continue |
|
500 | $ hg histedit --continue |
@@ -8,7 +8,7 b' Enable obsolete' | |||||
8 | > [phases] |
|
8 | > [phases] | |
9 | > publish=False |
|
9 | > publish=False | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 |
> |
|
11 | > stabilization=createmarkers,allowunstable | |
12 | > [extensions] |
|
12 | > [extensions] | |
13 | > histedit= |
|
13 | > histedit= | |
14 | > rebase= |
|
14 | > rebase= | |
@@ -545,7 +545,7 b' attempted later.' | |||||
545 | | |
|
545 | | | |
546 | o 0:cb9a9f314b8b (public) a |
|
546 | o 0:cb9a9f314b8b (public) a | |
547 |
|
547 | |||
548 |
$ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental. |
|
548 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.stabilization.track-operation=1 | |
549 | > pick b449568bf7fc 13 f |
|
549 | > pick b449568bf7fc 13 f | |
550 | > pick 7395e1ff83bd 15 h |
|
550 | > pick 7395e1ff83bd 15 h | |
551 | > pick 6b70183d2492 14 g |
|
551 | > pick 6b70183d2492 14 g | |
@@ -556,7 +556,7 b' attempted later.' | |||||
556 | Editing (ee118ab9fa44), you may commit or record as needed now. |
|
556 | Editing (ee118ab9fa44), you may commit or record as needed now. | |
557 | (hg histedit --continue to resume) |
|
557 | (hg histedit --continue to resume) | |
558 | [1] |
|
558 | [1] | |
559 |
$ hg histedit --continue --config experimental. |
|
559 | $ hg histedit --continue --config experimental.stabilization.track-operation=1 | |
560 | $ hg log -G |
|
560 | $ hg log -G | |
561 | @ 23:175d6b286a22 (secret) k |
|
561 | @ 23:175d6b286a22 (secret) k | |
562 | | |
|
562 | | |
@@ -326,7 +326,7 b' process.' | |||||
326 | $ cd largefiles-repo-hg |
|
326 | $ cd largefiles-repo-hg | |
327 | $ cat >> .hg/hgrc <<EOF |
|
327 | $ cat >> .hg/hgrc <<EOF | |
328 | > [experimental] |
|
328 | > [experimental] | |
329 |
> |
|
329 | > stabilization=createmarkers | |
330 | > EOF |
|
330 | > EOF | |
331 | $ hg debugobsolete `hg log -r tip -T "{node}"` |
|
331 | $ hg debugobsolete `hg log -r tip -T "{node}"` | |
332 | obsoleted 1 changesets |
|
332 | obsoleted 1 changesets |
@@ -1700,7 +1700,7 b' enable obsolete to test hidden feature' | |||||
1700 |
|
1700 | |||
1701 | $ cat >> $HGRCPATH << EOF |
|
1701 | $ cat >> $HGRCPATH << EOF | |
1702 | > [experimental] |
|
1702 | > [experimental] | |
1703 |
> |
|
1703 | > stabilization=createmarkers | |
1704 | > EOF |
|
1704 | > EOF | |
1705 |
|
1705 | |||
1706 | $ hg log --template='{rev}:{node}\n' |
|
1706 | $ hg log --template='{rev}:{node}\n' | |
@@ -2280,7 +2280,7 b' Even when the file revision is missing f' | |||||
2280 | $ hg init issue4490 |
|
2280 | $ hg init issue4490 | |
2281 | $ cd issue4490 |
|
2281 | $ cd issue4490 | |
2282 | $ echo '[experimental]' >> .hg/hgrc |
|
2282 | $ echo '[experimental]' >> .hg/hgrc | |
2283 |
$ echo ' |
|
2283 | $ echo 'stabilization=createmarkers' >> .hg/hgrc | |
2284 | $ echo a > a |
|
2284 | $ echo a > a | |
2285 | $ hg ci -Am0 |
|
2285 | $ hg ci -Am0 | |
2286 | adding a |
|
2286 | adding a |
@@ -10,7 +10,7 b' Global setup' | |||||
10 | > [phases] |
|
10 | > [phases] | |
11 | > publish=False |
|
11 | > publish=False | |
12 | > [experimental] |
|
12 | > [experimental] | |
13 |
> |
|
13 | > stabilization=all | |
14 | > [alias] |
|
14 | > [alias] | |
15 | > tlog = log -G -T '{node|short}\ |
|
15 | > tlog = log -G -T '{node|short}\ | |
16 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
|
16 | > {if(predecessors, "\n Predecessors: {predecessors}")}\ |
@@ -15,10 +15,10 b' Config setup' | |||||
15 | > |
|
15 | > | |
16 | > [experimental] |
|
16 | > [experimental] | |
17 | > # enable evolution |
|
17 | > # enable evolution | |
18 |
> |
|
18 | > stabilization = all | |
19 | > |
|
19 | > | |
20 | > # include obsmarkers in bundle |
|
20 | > # include obsmarkers in bundle | |
21 |
> |
|
21 | > stabilization.bundle-obsmarker = yes | |
22 | > |
|
22 | > | |
23 | > [extensions] |
|
23 | > [extensions] | |
24 | > # needed for some tests |
|
24 | > # needed for some tests |
@@ -3,7 +3,7 b' test-obsolete.t)' | |||||
3 |
|
3 | |||
4 | $ cat >> $HGRCPATH << EOF |
|
4 | $ cat >> $HGRCPATH << EOF | |
5 | > [experimental] |
|
5 | > [experimental] | |
6 |
> |
|
6 | > stabilization=createmarkers | |
7 | > EOF |
|
7 | > EOF | |
8 |
|
8 | |||
9 | Push does not corrupt remote |
|
9 | Push does not corrupt remote | |
@@ -87,7 +87,7 b' check that bundle is not affected' | |||||
87 |
|
87 | |||
88 | check-that bundle can contain markers: |
|
88 | check-that bundle can contain markers: | |
89 |
|
89 | |||
90 |
$ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental. |
|
90 | $ hg bundle --hidden --rev f89bcc95eba5 --base "f89bcc95eba5^" ../f89bcc95eba5-obs.hg --config experimental.stabilization.bundle-obsmarker=1 | |
91 | 1 changesets found |
|
91 | 1 changesets found | |
92 | $ hg debugbundle ../f89bcc95eba5.hg |
|
92 | $ hg debugbundle ../f89bcc95eba5.hg | |
93 | Stream params: sortdict([('Compression', 'BZ')]) |
|
93 | Stream params: sortdict([('Compression', 'BZ')]) |
@@ -6,7 +6,7 b' Check that obsolete properly strip heads' | |||||
6 | > [ui] |
|
6 | > [ui] | |
7 | > logtemplate='{node|short} ({phase}) {desc|firstline}\n' |
|
7 | > logtemplate='{node|short} ({phase}) {desc|firstline}\n' | |
8 | > [experimental] |
|
8 | > [experimental] | |
9 |
> |
|
9 | > stabilization=createmarkers | |
10 | > EOF |
|
10 | > EOF | |
11 | $ mkcommit() { |
|
11 | $ mkcommit() { | |
12 | > echo "$1" > "$1" |
|
12 | > echo "$1" > "$1" |
@@ -9,7 +9,7 b' Enable obsolete' | |||||
9 | > [ui] |
|
9 | > [ui] | |
10 | > logtemplate = {rev}:{node|short} {desc}\n |
|
10 | > logtemplate = {rev}:{node|short} {desc}\n | |
11 | > [experimental] |
|
11 | > [experimental] | |
12 |
> |
|
12 | > stabilization=createmarkers | |
13 | > [extensions] |
|
13 | > [extensions] | |
14 | > drawdag=$TESTDIR/drawdag.py |
|
14 | > drawdag=$TESTDIR/drawdag.py | |
15 | > [alias] |
|
15 | > [alias] |
@@ -5,7 +5,7 b'' | |||||
5 | > mock=$TESTDIR/mockblackbox.py |
|
5 | > mock=$TESTDIR/mockblackbox.py | |
6 | > |
|
6 | > | |
7 | > [experimental] |
|
7 | > [experimental] | |
8 |
> |
|
8 | > stabilization = createmarkers | |
9 | > EOF |
|
9 | > EOF | |
10 |
|
10 | |||
11 | Create a repo with some tags |
|
11 | Create a repo with some tags |
@@ -39,7 +39,7 b' Enabling it' | |||||
39 |
|
39 | |||
40 | $ cat >> $HGRCPATH << EOF |
|
40 | $ cat >> $HGRCPATH << EOF | |
41 | > [experimental] |
|
41 | > [experimental] | |
42 |
> |
|
42 | > stabilization=createmarkers,exchange | |
43 | > EOF |
|
43 | > EOF | |
44 |
|
44 | |||
45 | Killing a single changeset without replacement |
|
45 | Killing a single changeset without replacement | |
@@ -892,7 +892,7 b' check that web.view config option:' | |||||
892 | Checking _enable=False warning if obsolete marker exists |
|
892 | Checking _enable=False warning if obsolete marker exists | |
893 |
|
893 | |||
894 | $ echo '[experimental]' >> $HGRCPATH |
|
894 | $ echo '[experimental]' >> $HGRCPATH | |
895 |
$ echo " |
|
895 | $ echo "stabilization=" >> $HGRCPATH | |
896 | $ hg log -r tip |
|
896 | $ hg log -r tip | |
897 | obsolete feature not enabled but 68 markers found! |
|
897 | obsolete feature not enabled but 68 markers found! | |
898 | 68:c15e9edfca13 (draft) [tip ] add celestine |
|
898 | 68:c15e9edfca13 (draft) [tip ] add celestine | |
@@ -900,7 +900,7 b' Checking _enable=False warning if obsole' | |||||
900 | reenable for later test |
|
900 | reenable for later test | |
901 |
|
901 | |||
902 | $ echo '[experimental]' >> $HGRCPATH |
|
902 | $ echo '[experimental]' >> $HGRCPATH | |
903 |
$ echo " |
|
903 | $ echo "stabilization=createmarkers,exchange" >> $HGRCPATH | |
904 |
|
904 | |||
905 | $ rm hg.pid access.log errors.log |
|
905 | $ rm hg.pid access.log errors.log | |
906 | #endif |
|
906 | #endif | |
@@ -1263,7 +1263,7 b' Test ability to pull changeset with loca' | |||||
1263 | $ hg ci -m '2' |
|
1263 | $ hg ci -m '2' | |
1264 |
|
1264 | |||
1265 | $ echo bar > f2 |
|
1265 | $ echo bar > f2 | |
1266 |
$ hg commit --amend --config experimetnal. |
|
1266 | $ hg commit --amend --config experimetnal.stabilization=createmarkers | |
1267 | $ hg log -G |
|
1267 | $ hg log -G | |
1268 | @ 4:b0551702f918 (draft) [tip ] 2 |
|
1268 | @ 4:b0551702f918 (draft) [tip ] 2 | |
1269 | | |
|
1269 | | | |
@@ -1402,7 +1402,7 b' only a subset of those are displayed (be' | |||||
1402 | $ echo d > d |
|
1402 | $ echo d > d | |
1403 | $ hg ci -Am d |
|
1403 | $ hg ci -Am d | |
1404 | adding d |
|
1404 | adding d | |
1405 |
$ hg ci --amend -m dd --config experimental. |
|
1405 | $ hg ci --amend -m dd --config experimental.stabilization.track-operation=1 | |
1406 | $ hg debugobsolete --index --rev "3+7" |
|
1406 | $ hg debugobsolete --index --rev "3+7" | |
1407 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) |
|
1407 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 \(.*\) {'user': 'test'} (re) | |
1408 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
|
1408 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
@@ -588,7 +588,7 b' test hidden changeset are not cloned as ' | |||||
588 | (enabling evolution) |
|
588 | (enabling evolution) | |
589 | $ cat >> $HGRCPATH << EOF |
|
589 | $ cat >> $HGRCPATH << EOF | |
590 | > [experimental] |
|
590 | > [experimental] | |
591 |
> |
|
591 | > stabilization=createmarkers | |
592 | > EOF |
|
592 | > EOF | |
593 |
|
593 | |||
594 | (making a changeset hidden; H in that case) |
|
594 | (making a changeset hidden; H in that case) |
@@ -98,7 +98,7 b' A set of extension and shell functions e' | |||||
98 | > [phases] |
|
98 | > [phases] | |
99 | > publish = no |
|
99 | > publish = no | |
100 | > [experimental] |
|
100 | > [experimental] | |
101 |
> |
|
101 | > stabilization = all | |
102 | > [alias] |
|
102 | > [alias] | |
103 | > graph = log -G --rev 'sort(all(), "topo")' |
|
103 | > graph = log -G --rev 'sort(all(), "topo")' | |
104 | > EOF |
|
104 | > EOF |
@@ -400,7 +400,7 b' Test rebase with obsstore turned on and ' | |||||
400 | $ hg update E -q |
|
400 | $ hg update E -q | |
401 | $ echo 3 > B |
|
401 | $ echo 3 > B | |
402 | $ hg commit --amend -m E -A B -q |
|
402 | $ hg commit --amend -m E -A B -q | |
403 |
$ hg rebase -r B+D -d . --config experimental. |
|
403 | $ hg rebase -r B+D -d . --config experimental.stabilization=all | |
404 | rebasing 1:112478962961 "B" (B) |
|
404 | rebasing 1:112478962961 "B" (B) | |
405 | merging B |
|
405 | merging B | |
406 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
|
406 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') | |
@@ -411,7 +411,7 b' Test rebase with obsstore turned on and ' | |||||
411 | $ hg resolve -m |
|
411 | $ hg resolve -m | |
412 | (no more unresolved files) |
|
412 | (no more unresolved files) | |
413 | continue: hg rebase --continue |
|
413 | continue: hg rebase --continue | |
414 |
$ hg rebase --continue --config experimental. |
|
414 | $ hg rebase --continue --config experimental.stabilization=none | |
415 | rebasing 1:112478962961 "B" (B) |
|
415 | rebasing 1:112478962961 "B" (B) | |
416 | not rebasing ignored 2:26805aba1e60 "C" (C) |
|
416 | not rebasing ignored 2:26805aba1e60 "C" (C) | |
417 | rebasing 3:f585351a92f8 "D" (D) |
|
417 | rebasing 3:f585351a92f8 "D" (D) |
@@ -8,7 +8,7 b' Enable obsolete' | |||||
8 | > [ui] |
|
8 | > [ui] | |
9 | > logtemplate= {rev}:{node|short} {desc|firstline} |
|
9 | > logtemplate= {rev}:{node|short} {desc|firstline} | |
10 | > [experimental] |
|
10 | > [experimental] | |
11 |
> |
|
11 | > stabilization=createmarkers,allowunstable | |
12 | > [phases] |
|
12 | > [phases] | |
13 | > publish=False |
|
13 | > publish=False | |
14 | > [extensions] |
|
14 | > [extensions] | |
@@ -732,7 +732,7 b' Even when the chain include missing node' | |||||
732 | | |
|
732 | | | |
733 | o 0:4a2df7238c3b A |
|
733 | o 0:4a2df7238c3b A | |
734 |
|
734 | |||
735 |
$ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental. |
|
735 | $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.stabilization=all | |
736 | obsoleted 1 changesets |
|
736 | obsoleted 1 changesets | |
737 | $ hg rebase -d 6 -r "4::" |
|
737 | $ hg rebase -d 6 -r "4::" | |
738 | rebasing 4:ff2c4d47b71d "C" |
|
738 | rebasing 4:ff2c4d47b71d "C" | |
@@ -760,7 +760,7 b' should display a friendly error message' | |||||
760 | $ hg add nonrelevant |
|
760 | $ hg add nonrelevant | |
761 | $ hg commit -m nonrelevant |
|
761 | $ hg commit -m nonrelevant | |
762 | created new head |
|
762 | created new head | |
763 |
$ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental. |
|
763 | $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.stabilization=all | |
764 | obsoleted 1 changesets |
|
764 | obsoleted 1 changesets | |
765 | $ hg rebase -r . -d 10 |
|
765 | $ hg rebase -r . -d 10 | |
766 | note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor |
|
766 | note: not rebasing 11:f44da1f4954c "nonrelevant" (tip), it has no successor | |
@@ -885,7 +885,7 b' Create the changes that we will rebase' | |||||
885 | $ printf "dummy" > L |
|
885 | $ printf "dummy" > L | |
886 | $ hg add L |
|
886 | $ hg add L | |
887 | $ hg commit -m "dummy change" |
|
887 | $ hg commit -m "dummy change" | |
888 |
$ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental. |
|
888 | $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 19 -T '{node}'` --config experimental.stabilization=all | |
889 | obsoleted 1 changesets |
|
889 | obsoleted 1 changesets | |
890 |
|
890 | |||
891 | $ hg log -G -r 17:: |
|
891 | $ hg log -G -r 17:: | |
@@ -1121,7 +1121,7 b' Test that bookmark is moved and working ' | |||||
1121 | equivalents in destination |
|
1121 | equivalents in destination | |
1122 | $ hg init rbsrepo && cd rbsrepo |
|
1122 | $ hg init rbsrepo && cd rbsrepo | |
1123 | $ echo "[experimental]" > .hg/hgrc |
|
1123 | $ echo "[experimental]" > .hg/hgrc | |
1124 |
$ echo " |
|
1124 | $ echo "stabilization=all" >> .hg/hgrc | |
1125 | $ echo "rebaseskipobsolete=on" >> .hg/hgrc |
|
1125 | $ echo "rebaseskipobsolete=on" >> .hg/hgrc | |
1126 | $ echo root > root && hg ci -Am root |
|
1126 | $ echo root > root && hg ci -Am root | |
1127 | adding root |
|
1127 | adding root | |
@@ -1140,7 +1140,7 b' equivalents in destination' | |||||
1140 | $ hg up 2 && hg log -r . # working dir is at rev 2 again |
|
1140 | $ hg up 2 && hg log -r . # working dir is at rev 2 again | |
1141 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1141 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1142 | 2:1e9a3c00cbe9 b (no-eol) |
|
1142 | 2:1e9a3c00cbe9 b (no-eol) | |
1143 |
$ hg rebase -r 2 -d 3 --config experimental. |
|
1143 | $ hg rebase -r 2 -d 3 --config experimental.stabilization.track-operation=1 | |
1144 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" |
|
1144 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" | |
1145 | Check that working directory was updated to rev 3 although rev 2 was skipped |
|
1145 | Check that working directory was updated to rev 3 although rev 2 was skipped | |
1146 | during the rebase operation |
|
1146 | during the rebase operation |
@@ -7,7 +7,7 b' destination (issue5422)' | |||||
7 | > drawdag=$TESTDIR/drawdag.py |
|
7 | > drawdag=$TESTDIR/drawdag.py | |
8 | > |
|
8 | > | |
9 | > [experimental] |
|
9 | > [experimental] | |
10 |
> |
|
10 | > stabilization=createmarkers,allowunstable | |
11 | > |
|
11 | > | |
12 | > [alias] |
|
12 | > [alias] | |
13 | > tglog = log -G --template "{rev}: {desc}" |
|
13 | > tglog = log -G --template "{rev}: {desc}" |
@@ -933,7 +933,7 b' Testing rebase being called inside anoth' | |||||
933 | > [extensions] |
|
933 | > [extensions] | |
934 | > wraprebase=$TESTTMP/wraprebase.py |
|
934 | > wraprebase=$TESTTMP/wraprebase.py | |
935 | > [experimental] |
|
935 | > [experimental] | |
936 |
> |
|
936 | > stabilization=all | |
937 | > EOF |
|
937 | > EOF | |
938 |
|
938 | |||
939 | $ hg debugdrawdag <<'EOS' |
|
939 | $ hg debugdrawdag <<'EOS' |
@@ -1830,7 +1830,7 b" Test short 'ff...' hash collision" | |||||
1830 | $ cd wdir-hashcollision |
|
1830 | $ cd wdir-hashcollision | |
1831 | $ cat <<EOF >> .hg/hgrc |
|
1831 | $ cat <<EOF >> .hg/hgrc | |
1832 | > [experimental] |
|
1832 | > [experimental] | |
1833 |
> |
|
1833 | > stabilization = createmarkers | |
1834 | > EOF |
|
1834 | > EOF | |
1835 | $ echo 0 > a |
|
1835 | $ echo 0 > a | |
1836 | $ hg ci -qAm 0 |
|
1836 | $ hg ci -qAm 0 | |
@@ -4465,7 +4465,7 b' Test obsstore related revsets' | |||||
4465 | $ cd repo1 |
|
4465 | $ cd repo1 | |
4466 | $ cat <<EOF >> .hg/hgrc |
|
4466 | $ cat <<EOF >> .hg/hgrc | |
4467 | > [experimental] |
|
4467 | > [experimental] | |
4468 |
> |
|
4468 | > stabilization = createmarkers | |
4469 | > EOF |
|
4469 | > EOF | |
4470 |
|
4470 | |||
4471 | $ hg debugdrawdag <<'EOS' |
|
4471 | $ hg debugdrawdag <<'EOS' |
@@ -696,7 +696,7 b' test bug 4073 we need to enable obsolete' | |||||
696 |
|
696 | |||
697 | $ cat >> $HGRCPATH << EOF |
|
697 | $ cat >> $HGRCPATH << EOF | |
698 | > [experimental] |
|
698 | > [experimental] | |
699 |
> |
|
699 | > stabilization=createmarkers | |
700 | > EOF |
|
700 | > EOF | |
701 | $ hg shelve |
|
701 | $ hg shelve | |
702 | shelved as default |
|
702 | shelved as default |
@@ -1063,8 +1063,8 b' we have reusable code here' | |||||
1063 | $ cd $TESTTMP/scmutilcleanup.obsstore |
|
1063 | $ cd $TESTTMP/scmutilcleanup.obsstore | |
1064 | $ cat >> .hg/hgrc <<EOF |
|
1064 | $ cat >> .hg/hgrc <<EOF | |
1065 | > [experimental] |
|
1065 | > [experimental] | |
1066 |
> |
|
1066 | > stabilization=all | |
1067 |
> |
|
1067 | > stabilization.track-operation=1 | |
1068 | > EOF |
|
1068 | > EOF | |
1069 |
|
1069 | |||
1070 | $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py |
|
1070 | $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py |
@@ -76,7 +76,7 b' Enable obsolete' | |||||
76 | > [phases] |
|
76 | > [phases] | |
77 | > publish=False |
|
77 | > publish=False | |
78 | > [experimental] |
|
78 | > [experimental] | |
79 |
> |
|
79 | > stabilization=createmarkers | |
80 | > EOF |
|
80 | > EOF | |
81 |
|
81 | |||
82 | check that we can update parent repo with missing (amended) subrepo revision |
|
82 | check that we can update parent repo with missing (amended) subrepo revision |
@@ -473,7 +473,7 b' successors should be taken in account wh' | |||||
473 | > [ui] |
|
473 | > [ui] | |
474 | > logtemplate={rev}:{node|short} {desc|firstline} |
|
474 | > logtemplate={rev}:{node|short} {desc|firstline} | |
475 | > [experimental] |
|
475 | > [experimental] | |
476 |
> |
|
476 | > stabilization=createmarkers | |
477 | > EOF |
|
477 | > EOF | |
478 |
|
478 | |||
479 | Test no-argument update to a successor of an obsoleted changeset |
|
479 | Test no-argument update to a successor of an obsoleted changeset |
General Comments 0
You need to be logged in to leave comments.
Login now