Mercurial > evolve
changeset 6814:c203bc3114bb mercurial-5.1
test-compat: merge mercurial-5.2 into mercurial-5.1
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 27 Jun 2024 01:07:01 +0400 |
| parents | 3c880848174c (current diff) 80d5e11713f5 (diff) |
| children | cde3f4bc3075 6859ed744625 |
| files | |
| diffstat | 77 files changed, 173 insertions(+), 182 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-amend.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-amend.t Thu Jun 27 01:07:01 2024 +0400 @@ -219,12 +219,10 @@ $ hg ci -m "edited a" 1 new orphan changesets $ hg debugobsolete $(hg id -ir 0 --debug) $(hg id -ir 2 --debug) - 1 new obsolescence markers 2 new content-divergent changesets remove divergence by pruning one side of divergenence $ hg debugobsolete $(hg id -ir 2 --debug) - 1 new obsolescence markers obsoleted 1 changesets $ hg evolve -l
--- a/tests/test-check-commit.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-check-commit.t Thu Jun 27 01:07:01 2024 +0400 @@ -1,5 +1,10 @@ #require test-repo +Mercurial 5.1 has a really outdated contrib/check-commit compared to the +current commit and code standards in evolve + + $ exit 80 + Enable obsolescence to avoid the warning issue when obsmarkers are found $ cat << EOF >> $HGRCPATH
--- a/tests/test-discovery-hidden-common.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-discovery-hidden-common.t Thu Jun 27 01:07:01 2024 +0400 @@ -49,7 +49,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets second pull: @@ -79,7 +78,6 @@ $ mkcommit A2 created new head $ hg debugobsolete `getid 'desc(A1)'` `getid 'desc(A2)'` - 1 new obsolescence markers obsoleted 1 changesets third pull:
--- a/tests/test-discovery-obshashrange-cache.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-discovery-obshashrange-cache.t Thu Jun 27 01:07:01 2024 +0400 @@ -26,21 +26,13 @@ > hg -R main debugobsolete $anc $node > done marking 000011223334456677789aaaaabbbbcccddddeef as predecessors of 4de32a90b66cd083ebf3c00b41277aa7abca51dd - 1 new obsolescence markers marking 012234455555666699aaaaabbbccccccefffffff as predecessors of f69452c5b1af6cbaaa56ef50cf94fff5bcc6ca23 - 1 new obsolescence markers marking 00001122233445555777778889999abbcccddeef as predecessors of c8d03c1b5e94af74b772900c58259d2e08917735 - 1 new obsolescence markers marking 0011222445667777889999aabbbbcddddeeeeeee as predecessors of bebd167eb94d257ace0e814aeb98e6972ed2970d - 1 new obsolescence markers marking 000011222223344555566778899aaaabccddefff as predecessors of 2dc09a01254db841290af0538aa52f6f52c776e3 - 1 new obsolescence markers marking 01111222223333444455555566999abbbbcceeef as predecessors of 01241442b3c2bf3211e593b549c655ea65b295e3 - 1 new obsolescence markers marking 01122444445555566677888aabbcccddddefffff as predecessors of 66f7d451a68b85ed82ff5fcc254daf50c74144bd - 1 new obsolescence markers marking 000111111234444467777889999aaaabcdeeeeff as predecessors of 1ea73414a91b0920940797d8fc6a11e447f8ea1e - 1 new obsolescence markers $ hg debugobsolete -R main 000011223334456677789aaaaabbbbcccddddeef 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-discovery-obshashrange.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-discovery-obshashrange.t Thu Jun 27 01:07:01 2024 +0400 @@ -61,15 +61,10 @@ $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'` - 1 new obsolescence markers $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1 - 1 new obsolescence markers $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'` - 1 new obsolescence markers $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0 - 1 new obsolescence markers $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'` - 1 new obsolescence markers $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -171,7 +166,6 @@ $ hg add foo $ hg commit -m foo $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` - 1 new obsolescence markers $ hg push -f --debug could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) @@ -222,14 +216,14 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files (+1 heads) - remote: 1 new obsolescence markers bundle2-input-bundle: no-transaction bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported - bundle2-input-bundle: 2 parts total + bundle2-input-bundle: 1 parts total preparing listkeys for "phases" sending listkeys command received listkey for "phases": 58 bytes + remote: 1 new obsolescence markers $ hg -R ../server blackbox * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob) @@ -261,9 +255,7 @@ o 0 1ea73414a91b r0 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` - 1 new obsolescence markers $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'` - 1 new obsolescence markers $ hg push pushing to ssh://user@dummy/server searching for changes @@ -350,7 +342,7 @@ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: no-transaction (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported (glob) - * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 2 parts total (glob) + * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 1 parts total (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob) * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob) @@ -396,9 +388,7 @@ o 0 1ea73414a91b r0 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` - 1 new obsolescence markers $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'` - 1 new obsolescence markers $ hg pull -r 6 pulling from ssh://user@dummy/server searching for changes @@ -486,9 +476,7 @@ 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 7 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'` - 1 new obsolescence markers $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'` - 1 new obsolescence markers $ hg pull -r `getid 'desc(r6)'` pulling from ssh://user@dummy/server no changes found @@ -568,7 +556,6 @@ 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 6 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'` - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 c7f1f7e9925b @@ -653,7 +640,6 @@ 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 6 f69452c5b1af 6 1 7 000000000000 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash @@ -738,7 +724,6 @@ New marker prefixed to another one $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')` - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 0ffc0013bda0 @@ -801,7 +786,6 @@ New prune marker prefixed to another one $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa - 1 new obsolescence markers $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' rev node index size depth obshash 7 4de32a90b66c 0 8 8 87b2a11bd884 @@ -1119,6 +1103,7 @@ stable-range cache: unable to load, regenerating obshashrange cache: unable to load, regenerating updating the branch cache + invalid branch cache (served): tip differs $ f -s .hg/cache/evoext* .hg/cache/evoext-depthcache-00: size=96 .hg/cache/evoext-firstmerge-00: size=96
--- a/tests/test-evolve-templates.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-evolve-templates.t Thu Jun 27 01:07:01 2024 +0400 @@ -1181,14 +1181,11 @@ Create the cycle $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"` - 1 new obsolescence markers Check templates --------------- @@ -1381,7 +1378,6 @@ summary: ROOT $ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G @ changeset: 7:ba2ed02b0c9a
--- a/tests/test-exchange-obsmarkers-case-A1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A1.t Thu Jun 27 01:07:01 2024 +0400 @@ -53,7 +53,6 @@ $ cd main $ mkcommit A $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` - 1 new obsolescence markers $ hg log -G @ f5bc6836db60 (draft): A | @@ -212,7 +211,6 @@ o a9bdc8b26820 (public): O $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` - 1 new obsolescence markers $ inspect_obsmarkers obsstore content ================
--- a/tests/test-exchange-obsmarkers-case-A2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A2.t Thu Jun 27 01:07:01 2024 +0400 @@ -56,13 +56,11 @@ $ cd main $ mkcommit A $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` - 1 new obsolescence markers $ hg up '.~1' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B created new head $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B)'` - 1 new obsolescence markers $ hg log -G @ 35b183996678 (draft): B |
--- a/tests/test-exchange-obsmarkers-case-A3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A3.t Thu Jun 27 01:07:01 2024 +0400 @@ -73,11 +73,9 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ f6298a8ac3a4 (draft): B1 @@ -180,11 +178,9 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ f6298a8ac3a4 (draft): B1
--- a/tests/test-exchange-obsmarkers-case-A4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A4.t Thu Jun 27 01:07:01 2024 +0400 @@ -63,9 +63,7 @@ $ mkcommit A1 created new head $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` - 1 new obsolescence markers $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-A5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A5.t Thu Jun 27 01:07:01 2024 +0400 @@ -65,12 +65,9 @@ created new head $ mkcommit A1 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` - 1 new obsolescence markers $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 8c0a98c83722 (draft): A1
--- a/tests/test-exchange-obsmarkers-case-A6.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A6.t Thu Jun 27 01:07:01 2024 +0400 @@ -64,7 +64,6 @@ create a marker after this $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ e5ea8f9c7314 (draft): A1
--- a/tests/test-exchange-obsmarkers-case-A7.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-A7.t Thu Jun 27 01:07:01 2024 +0400 @@ -51,7 +51,6 @@ $ hg push -q ../pushdest $ hg push -q ../pulldest $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'` - 1 new obsolescence markers $ hg log -G --hidden @ f5bc6836db60 (draft): A |
--- a/tests/test-exchange-obsmarkers-case-B5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-B5.t Thu Jun 27 01:07:01 2024 +0400 @@ -70,13 +70,10 @@ created new head $ mkcommit B1 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'` - 1 new obsolescence markers $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg prune -qd '0 0' 'desc(B1)' $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-B6.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-B6.t Thu Jun 27 01:07:01 2024 +0400 @@ -57,7 +57,6 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg prune -qd '0 0' . $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-C2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-C2.t Thu Jun 27 01:07:01 2024 +0400 @@ -62,7 +62,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ e5ea8f9c7314 (draft): A1
--- a/tests/test-exchange-obsmarkers-case-C3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-C3.t Thu Jun 27 01:07:01 2024 +0400 @@ -64,7 +64,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg prune -qd '0 0' . $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-C4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-C4.t Thu Jun 27 01:07:01 2024 +0400 @@ -65,10 +65,8 @@ $ mkcommit C created new head $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'` - 1 new obsolescence markers 2 new content-divergent changesets $ hg prune -qd '0 0' . $ hg log -G --hidden
--- a/tests/test-exchange-obsmarkers-case-D1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-D1.t Thu Jun 27 01:07:01 2024 +0400 @@ -61,7 +61,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg prune -d '0 0' 'desc(B)'
--- a/tests/test-exchange-obsmarkers-case-D2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-D2.t Thu Jun 27 01:07:01 2024 +0400 @@ -54,7 +54,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg prune --date '0 0' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-exchange-obsmarkers-case-D3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-D3.t Thu Jun 27 01:07:01 2024 +0400 @@ -57,7 +57,6 @@ created new head $ mkcommit A1 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` - 1 new obsolescence markers obsoleted 1 changesets $ hg prune -d '0 0' . 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-exchange-obsmarkers-case-D4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-exchange-obsmarkers-case-D4.t Thu Jun 27 01:07:01 2024 +0400 @@ -59,16 +59,12 @@ created new head $ mkcommit B1 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'` - 1 new obsolescence markers $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'` - 1 new obsolescence markers $ hg log -G --hidden @ 069b05c3876d (draft): B1 |
--- a/tests/test-namespaces-exchange.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-namespaces-exchange.t Thu Jun 27 01:07:01 2024 +0400 @@ -119,8 +119,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: bob - added 1 changesets with 1 changes to 1 files new changesets ed9751f04a18 (1 drafts) (run 'hg update' to get a working copy) @@ -142,8 +142,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: charlie - added 1 changesets with 1 changes to 1 files new changesets 16d2440597e2 (1 drafts) (run 'hg update' to get a working copy) @@ -165,8 +165,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: dave - added 1 changesets with 1 changes to 1 files new changesets d5d5dda52b2f (1 drafts) (run 'hg update' to get a working copy)
--- a/tests/test-namespaces-reject.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-namespaces-reject.t Thu Jun 27 01:07:01 2024 +0400 @@ -56,6 +56,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files transaction abort! rollback completed abort: rejecting draft changesets with topic namespace: ed9751f04a18 @@ -74,7 +75,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: bob - added 1 changesets with 1 changes to 1 files $ cd ..
--- a/tests/test-namespaces-report.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-namespaces-report.t Thu Jun 27 01:07:01 2024 +0400 @@ -50,8 +50,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: bob - added 1 changesets with 1 changes to 1 files $ cd .. @@ -73,9 +73,9 @@ adding changesets adding manifests adding file changes - topic namespaces affected: bob bruce added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers + topic namespaces affected: bob bruce obsoleted 1 changesets $ cd .. @@ -117,9 +117,9 @@ adding changesets adding manifests adding file changes - topic namespaces affected: bruce carol added 2 changesets with 2 changes to 1 files 2 new obsolescence markers + topic namespaces affected: bruce carol $ cd .. @@ -162,8 +162,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files topic namespaces affected: dana - added 1 changesets with 1 changes to 1 files $ hg debug-topic-namespace dave $ echo dragonfruit > d @@ -175,9 +175,9 @@ adding changesets adding manifests adding file changes - topic namespaces affected: dana dave added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers + topic namespaces affected: dana dave obsoleted 1 changesets $ hg bookmark --hidden -r 'desc("durian")' @ @@ -257,8 +257,8 @@ adding changesets adding manifests adding file changes + added 0 changesets with 0 changes to 1 files topic namespaces affected: dave - added 0 changesets with 0 changes to 1 files active topic 'd' grew its first changeset (see 'hg help topics' for more information) @@ -272,7 +272,6 @@ $ cd orig $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid "desc('dragonfruit')"` - 1 new obsolescence markers $ hg push ../case-99 pushing to ../case-99
--- a/tests/test-obsolete.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-obsolete.t Thu Jun 27 01:07:01 2024 +0400 @@ -28,7 +28,6 @@ $ getid 3 0d3f46688ccc6e756c7e96cf64c391c411309597 $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} @@ -93,7 +92,6 @@ $ mkcommit "obsol_c'" # 4 (on 1) created new head $ hg debugobsolete `getid 3` `getid 4` - 1 new obsolescence markers obsoleted 1 changesets $ qlog 4 @@ -213,7 +211,6 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 5` `getid 6` - 1 new obsolescence markers obsoleted 1 changesets $ qlog 6 @@ -273,7 +270,6 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 6` `getid 7` - 1 new obsolescence markers obsoleted 1 changesets $ hg pull -R ../other-new . pulling from . @@ -365,7 +361,6 @@ 1 new orphan changesets created new head $ hg debugobsolete `getid 7` `getid 8` - 1 new obsolescence markers obsoleted 1 changesets $ cd ../other-new $ hg up -q 3 @@ -429,7 +424,6 @@ $ hg id -n 9 $ hg debugobsolete `getid 0` `getid 9` - 1 new obsolescence markers 1 new phase-divergent changesets 83b5778897ad try to obsolete immutable changeset 1f0dee641bb7 # at core level the warning is not issued @@ -454,7 +448,6 @@ - 1f0dee641bb7 $ hg debugobsolete `getid 9` #kill - 1 new obsolescence markers obsoleted 1 changesets $ hg up null -q # to be not based on 9 anymore $ qlog @@ -559,7 +552,6 @@ $ mkcommit "obsol_d'''" created new head $ hg debugobsolete `getid 'max(desc("re:^add obsol_d'\'\''$"))'` `getid 'desc("re:^add obsol_d'\'\'\''$")'` - 1 new obsolescence markers obsoleted 1 changesets $ hg push ../other-new --traceback pushing to ../other-new @@ -676,7 +668,6 @@ phases: 3 draft phase-divergent: 1 changesets $ hg debugobsolete `getid 'desc("re:^add d$")'` `getid 'desc("re:^add obsolet_conflicting_d$")'` - 1 new obsolescence markers 2 new content-divergent changesets $ hg log -r 'contentdivergent()' changeset: 11:5a9eef7b778b
--- a/tests/test-pullbundle.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-pullbundle.t Thu Jun 27 01:07:01 2024 +0400 @@ -125,6 +125,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 1024 changesets with 0 changes to 0 files bundle2-input-part: total payload size 186208 (no-default-cg3 !) bundle2-input-part: total payload size 188260 (default-cg3 !) bundle2-input: part header size: 43 @@ -139,6 +140,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 128 changesets with 0 changes to 0 files bundle2-input-part: total payload size 23564 (no-default-cg3 !) bundle2-input-part: total payload size 23824 (default-cg3 !) bundle2-input: part header size: 42 @@ -153,6 +155,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 64 changesets with 0 changes to 0 files bundle2-input-part: total payload size 11788 (no-default-cg3 !) bundle2-input-part: total payload size 11920 (default-cg3 !) bundle2-input: part header size: 42 @@ -167,6 +170,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 16 changesets with 0 changes to 0 files bundle2-input-part: total payload size 2956 (no-default-cg3 !) bundle2-input-part: total payload size 2992 (default-cg3 !) bundle2-input: part header size: 41 @@ -181,6 +185,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 2 changesets with 0 changes to 0 files bundle2-input-part: total payload size 380 (no-default-cg3 !) bundle2-input-part: total payload size 388 (default-cg3 !) bundle2-input: part header size: 41 @@ -195,6 +200,7 @@ bundle2-input: payload chunk size: 0 adding manifests adding file changes + added 1 changesets with 0 changes to 0 files bundle2-input-part: total payload size 196 (no-default-cg3 !) bundle2-input-part: total payload size 202 (default-cg3 !) bundle2-input: part header size: 18 @@ -217,12 +223,11 @@ bundle2-input-part: total payload size 24719 bundle2-input: part header size: 0 bundle2-input: end of bundle2 stream - bundle2-input-bundle: 8 parts total + bundle2-input-bundle: 7 parts total checking for updated bookmarks stable-range cache: unable to load, regenerating obshashrange cache: unable to load, regenerating updating the branch cache - added 1235 changesets with 0 changes to 0 files new changesets 1ea73414a91b:f864bc82f6a2 (run 'hg update' to get a working copy) @@ -259,7 +264,7 @@ $ hg -R client pull server --verbose pulling from server searching for changes - all local changesets known remotely + all local heads known remotely pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob) 1 changesets found 4 changesets found @@ -354,58 +359,75 @@ adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 896 changesets with 0 changes to 0 files (+1 heads) + added 8 changesets with 0 changes to 0 files new changesets 17185c1c22f1:0f376356904f (run 'hg heads' to see heads, 'hg merge' to merge) @@ -463,22 +485,27 @@ adding changesets adding manifests adding file changes + added 1024 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 1235 changesets with 0 changes to 0 files + added 1 changesets with 0 changes to 0 files new changesets 1ea73414a91b:f864bc82f6a2 (run 'hg update' to get a working copy) @@ -503,7 +530,7 @@ $ hg -R client2 pull server --verbose pulling from server searching for changes - all local changesets known remotely + all local heads known remotely pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob) 1 changesets found in caches 4 changesets found in caches @@ -526,58 +553,75 @@ adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 896 changesets with 0 changes to 0 files (+1 heads) + added 8 changesets with 0 changes to 0 files new changesets 17185c1c22f1:0f376356904f (run 'hg heads' to see heads, 'hg merge' to merge) @@ -633,15 +677,19 @@ adding changesets adding manifests adding file changes + added 1024 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 227 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 29 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files (-1 heads) adding changesets uncompressed size of bundle content: 5892 (changelog) (no-default-cg3 !) @@ -661,19 +709,23 @@ 4 (manifests) adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 1523 changesets with 0 changes to 0 files + added 1 changesets with 0 changes to 0 files new changesets 1ea73414a91b:44e80141ad53 (run 'hg update' to get a working copy) @@ -727,7 +779,7 @@ $ hg -R client3 pull server --verbose pulling from server searching for changes - all local changesets known remotely + all local heads known remotely pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob) 1 changesets found 4 changesets found @@ -776,52 +828,67 @@ adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 608 changesets with 0 changes to 0 files (+1 heads) + added 8 changesets with 0 changes to 0 files new changesets d1807e351389:0f376356904f (run 'hg heads' to see heads, 'hg merge' to merge) @@ -899,52 +966,67 @@ adding changesets adding manifests adding file changes + added 1024 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 2131 changesets with 0 changes to 0 files (+1 heads) + added 8 changesets with 0 changes to 0 files new changesets 1ea73414a91b:0f376356904f (run 'hg heads' to see heads, 'hg merge' to merge) @@ -1017,25 +1099,29 @@ adding changesets adding manifests adding file changes + added 512 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 901 changesets with 0 changes to 0 files (+1 heads) + added 1 changesets with 0 changes to 0 files (+1 heads) new changesets 1ea73414a91b:c31a4e0cc28d (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R test-local-missing pull server --verbose pulling from server searching for changes - all local changesets known remotely + all local heads known remotely pullbundle-cache: "missing" set sliced into 19 subranges in *.* seconds (glob) 4 changesets found 8 changesets found @@ -1079,61 +1165,79 @@ adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 1230 changesets with 0 changes to 0 files + added 8 changesets with 0 changes to 0 files new changesets e600b80a2fc8:0f376356904f (run 'hg update' to get a working copy) @@ -1155,52 +1259,67 @@ adding changesets adding manifests adding file changes + added 1024 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 128 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 32 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 2 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 0 files (+1 heads) adding changesets adding manifests adding file changes + added 4 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 8 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 16 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 256 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes + added 64 changesets with 0 changes to 0 files adding changesets adding manifests adding file changes - added 2131 changesets with 0 changes to 0 files (+1 heads) + added 8 changesets with 0 changes to 0 files new changesets 1ea73414a91b:0f376356904f updating to branch default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-mixed-branch-topic-G1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G1.t Thu Jun 27 01:07:01 2024 +0400 @@ -64,7 +64,6 @@ marked working directory as topic: Z $ mkcommit B1 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 845eeb768064 [default//Z] (draft): B1
--- a/tests/test-push-checkheads-mixed-branch-topic-G2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G2.t Thu Jun 27 01:07:01 2024 +0400 @@ -71,11 +71,9 @@ (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0c76bc104656 [default] (draft): C1
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t Thu Jun 27 01:07:01 2024 +0400 @@ -70,7 +70,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ dc44c53142f0 [default] (draft): C1
--- a/tests/test-push-checkheads-multi-topics-F1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multi-topics-F1.t Thu Jun 27 01:07:01 2024 +0400 @@ -68,7 +68,6 @@ marked working directory as topic: Z $ mkcommit B1 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 845eeb768064 [default//Z] (draft): B1
--- a/tests/test-push-checkheads-multi-topics-F2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multi-topics-F2.t Thu Jun 27 01:07:01 2024 +0400 @@ -75,11 +75,9 @@ $ mkcommit A1 $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0e26ba57d799 [default//Y] (draft): C1
--- a/tests/test-push-checkheads-multi-topics-F3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multi-topics-F3.t Thu Jun 27 01:07:01 2024 +0400 @@ -74,7 +74,6 @@ marked working directory as topic: Y $ mkcommit C1 $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 57530ca5eb24 [default//Y] (draft): C1
--- a/tests/test-push-checkheads-multibranches-E1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multibranches-E1.t Thu Jun 27 01:07:01 2024 +0400 @@ -65,7 +65,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 7f7cd4ea4626 [double//slash] (draft): B1
--- a/tests/test-push-checkheads-multibranches-E2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multibranches-E2.t Thu Jun 27 01:07:01 2024 +0400 @@ -71,11 +71,9 @@ (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0c76bc104656 [default] (draft): C1
--- a/tests/test-push-checkheads-multibranches-E3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-multibranches-E3.t Thu Jun 27 01:07:01 2024 +0400 @@ -70,7 +70,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ dc44c53142f0 [default] (draft): C1
--- a/tests/test-push-checkheads-partial-C1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-partial-C1.t Thu Jun 27 01:07:01 2024 +0400 @@ -58,7 +58,6 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-partial-C2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-partial-C2.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,7 +60,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-partial-C3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-partial-C3.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,7 +60,6 @@ $ mkcommit C0 created new head $ hg debugobsolete --record-parents `getid "desc(B0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0f88766e02d6 [default] (draft): C0
--- a/tests/test-push-checkheads-partial-C4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-partial-C4.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,7 +60,6 @@ $ mkcommit C0 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden
--- a/tests/test-push-checkheads-pruned-B1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B1.t Thu Jun 27 01:07:01 2024 +0400 @@ -49,7 +49,6 @@ $ mkcommit B0 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 74ff5441d343 [default] (draft): B0
--- a/tests/test-push-checkheads-pruned-B2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B2.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,11 +60,9 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ f6082bc4ffef [default] (draft): A1
--- a/tests/test-push-checkheads-pruned-B3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B3.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,11 +60,9 @@ $ mkcommit B1 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-pruned-B4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B4.t Thu Jun 27 01:07:01 2024 +0400 @@ -61,11 +61,9 @@ $ mkcommit C0 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0f88766e02d6 [default] (draft): C0
--- a/tests/test-push-checkheads-pruned-B5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B5.t Thu Jun 27 01:07:01 2024 +0400 @@ -64,14 +64,11 @@ $ mkcommit B1 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(C0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-pruned-B6.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B6.t Thu Jun 27 01:07:01 2024 +0400 @@ -52,10 +52,8 @@ $ hg up 'desc(B0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden x ba93660aff8d [default] (draft): A1
--- a/tests/test-push-checkheads-pruned-B7.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B7.t Thu Jun 27 01:07:01 2024 +0400 @@ -51,10 +51,8 @@ $ hg up 'desc(B0)' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden x ba93660aff8d [default] (draft): A1
--- a/tests/test-push-checkheads-pruned-B8.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-pruned-B8.t Thu Jun 27 01:07:01 2024 +0400 @@ -67,17 +67,13 @@ $ mkcommit A2 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ c1f8d089020f [default] (draft): A2
--- a/tests/test-push-checkheads-supersede-A1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A1.t Thu Jun 27 01:07:01 2024 +0400 @@ -46,7 +46,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ f6082bc4ffef [default] (draft): A1
--- a/tests/test-push-checkheads-supersede-A2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A2.t Thu Jun 27 01:07:01 2024 +0400 @@ -60,11 +60,9 @@ created new head $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 262c8c798096 [default] (draft): B1
--- a/tests/test-push-checkheads-supersede-A3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A3.t Thu Jun 27 01:07:01 2024 +0400 @@ -63,11 +63,9 @@ created new head $ mkcommit A1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ c1c7524e9488 [default] (draft): A1
--- a/tests/test-push-checkheads-supersede-A4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A4.t Thu Jun 27 01:07:01 2024 +0400 @@ -48,7 +48,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ mkcommit B0 $ hg log -G --hidden
--- a/tests/test-push-checkheads-supersede-A5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A5.t Thu Jun 27 01:07:01 2024 +0400 @@ -49,7 +49,6 @@ created new head $ mkcommit A1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ ba93660aff8d [default] (draft): A1
--- a/tests/test-push-checkheads-supersede-A6.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A6.t Thu Jun 27 01:07:01 2024 +0400 @@ -69,11 +69,9 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ d70a1f75a020 [default] (draft): B1
--- a/tests/test-push-checkheads-supersede-A7.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A7.t Thu Jun 27 01:07:01 2024 +0400 @@ -69,11 +69,9 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-supersede-A8.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-supersede-A8.t Thu Jun 27 01:07:01 2024 +0400 @@ -53,10 +53,8 @@ $ mkcommit A2 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ c1f8d089020f [default] (draft): A2
--- a/tests/test-push-checkheads-unpushed-D1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D1.t Thu Jun 27 01:07:01 2024 +0400 @@ -49,7 +49,6 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D2.t Thu Jun 27 01:07:01 2024 +0400 @@ -64,11 +64,9 @@ $ mkcommit A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D3.t Thu Jun 27 01:07:01 2024 +0400 @@ -67,11 +67,9 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-unpushed-D4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D4.t Thu Jun 27 01:07:01 2024 +0400 @@ -83,11 +83,9 @@ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ d70a1f75a020 [default] (draft): B1
--- a/tests/test-push-checkheads-unpushed-D5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D5.t Thu Jun 27 01:07:01 2024 +0400 @@ -72,11 +72,9 @@ $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 [default] (draft): B1
--- a/tests/test-push-checkheads-unpushed-D6.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D6.t Thu Jun 27 01:07:01 2024 +0400 @@ -56,10 +56,8 @@ $ mkcommit C0 created new head $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0f88766e02d6 [default] (draft): C0
--- a/tests/test-push-checkheads-unpushed-D7.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-push-checkheads-unpushed-D7.t Thu Jun 27 01:07:01 2024 +0400 @@ -65,13 +65,10 @@ $ mkcommit C0 created new head $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete --record-parents `getid "desc(A2)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0f88766e02d6 [default] (draft): C0
--- a/tests/test-single-head-obsolescence-named-branch-A1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A1.t Thu Jun 27 01:07:01 2024 +0400 @@ -71,11 +71,9 @@ (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 262c8c798096 [default] (draft): B1
--- a/tests/test-single-head-obsolescence-named-branch-A2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A2.t Thu Jun 27 01:07:01 2024 +0400 @@ -71,7 +71,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg log -G --hidden @@ -99,6 +98,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default"
--- a/tests/test-single-head-obsolescence-named-branch-A3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A3.t Thu Jun 27 01:07:01 2024 +0400 @@ -79,11 +79,9 @@ (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0c76bc104656 [default] (draft): C1
--- a/tests/test-single-head-obsolescence-named-branch-A4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A4.t Thu Jun 27 01:07:01 2024 +0400 @@ -79,7 +79,6 @@ created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-named-branch-A5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-named-branch-A5.t Thu Jun 27 01:07:01 2024 +0400 @@ -76,7 +76,6 @@ (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit B1 $ hg debugobsolete `getid "desc(M0)"` --record-parents - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden @@ -104,6 +103,7 @@ pushing to $TESTTMP/A5/server searching for changes no changes found + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default"
--- a/tests/test-single-head-obsolescence-topic-B1.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-topic-B1.t Thu Jun 27 01:07:01 2024 +0400 @@ -77,11 +77,9 @@ $ mkcommit A1 $ mkcommit B1 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ f4ed6717fb66 [default//topic-X] (draft): B1
--- a/tests/test-single-head-obsolescence-topic-B2.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-topic-B2.t Thu Jun 27 01:07:01 2024 +0400 @@ -79,7 +79,6 @@ marked working directory as topic: topic-X $ mkcommit B1 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"` - 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg log -G --hidden @@ -107,6 +106,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default//topic-X"
--- a/tests/test-single-head-obsolescence-topic-B3.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-topic-B3.t Thu Jun 27 01:07:01 2024 +0400 @@ -79,11 +79,9 @@ $ mkcommit A1 $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"` - 1 new obsolescence markers obsoleted 1 changesets 3 new orphan changesets $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 9f6e6381b9aa [default//topic-X] (draft): C1
--- a/tests/test-single-head-obsolescence-topic-B4.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-topic-B4.t Thu Jun 27 01:07:01 2024 +0400 @@ -79,7 +79,6 @@ $ hg topic topic-X $ mkcommit C1 $ hg debugobsolete `getid "desc(C0)"` `getid "desc(C1)"` - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden
--- a/tests/test-single-head-obsolescence-topic-B5.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-single-head-obsolescence-topic-B5.t Thu Jun 27 01:07:01 2024 +0400 @@ -80,7 +80,6 @@ $ mkcommit A1 $ mkcommit B1 $ hg debugobsolete `getid "desc(M0)"` --record-parents - 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg log -G --hidden @@ -108,6 +107,7 @@ pushing to $TESTTMP/B5/server searching for changes no changes found + 1 new obsolescence markers transaction abort! rollback completed abort: rejecting multiple heads on branch "default//topic-X"
--- a/tests/test-topic-flow-reject-untopiced.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-topic-flow-reject-untopiced.t Thu Jun 27 01:07:01 2024 +0400 @@ -73,6 +73,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files transaction abort! rollback completed abort: rejecting draft changesets: 4e8b0e0237c6 @@ -84,6 +85,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files transaction abort! rollback completed abort: rejecting draft changesets: 4e8b0e0237c6 @@ -119,6 +121,7 @@ adding changesets adding manifests adding file changes + added 4 changesets with 4 changes to 4 files transaction abort! rollback completed abort: rejecting draft changesets: 4e8b0e0237c6 @@ -136,6 +139,7 @@ adding changesets adding manifests adding file changes + added 4 changesets with 4 changes to 4 files transaction abort! rollback completed abort: rejecting draft changesets: 4e8b0e0237c6
--- a/tests/test-topic-flow-single-head.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-topic-flow-single-head.t Thu Jun 27 01:07:01 2024 +0400 @@ -70,6 +70,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) transaction abort! rollback completed abort: 2 heads on "default" @@ -144,6 +145,7 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files (+1 heads) transaction abort! rollback completed abort: 2 heads on "default//bar"
--- a/tests/test-topic-tutorial.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-topic-tutorial.t Thu Jun 27 01:07:01 2024 +0400 @@ -478,7 +478,7 @@ $ hg merge abort: branch 'default' has one head - please merge with an explicit rev - (run 'hg heads' to see all heads, specify rev with -r) + (run 'hg heads' to see all heads) [255] But the topic will see that branch head as a valid destination:
--- a/tests/test-wireproto.t Wed Jun 26 23:48:03 2024 +0400 +++ b/tests/test-wireproto.t Thu Jun 27 01:07:01 2024 +0400 @@ -70,8 +70,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: obsmarker-exchange: 92 bytes received - remote: added 1 changesets with 1 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg push @@ -89,8 +89,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) obsmarker-exchange: 92 bytes received - added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) 1 new obsolescence markers obsoleted 1 changesets new changesets 9d1c114e7797 (1 drafts) @@ -114,8 +114,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 1 changes to 1 files remote: obsmarker-exchange: 92 bytes received - remote: added 1 changesets with 1 changes to 1 files remote: 1 new obsolescence markers $ hg -R ../other pull pulling from ssh://user@dummy/server @@ -123,8 +123,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 1 changes to 1 files obsmarker-exchange: 92 bytes received - added 1 changesets with 1 changes to 1 files 1 new obsolescence markers new changesets a5687ec59dd4 (1 drafts) (run 'hg update' to get a working copy) @@ -138,8 +138,8 @@ remote: adding changesets remote: adding manifests remote: adding file changes + remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: obsmarker-exchange: 183 bytes received - remote: added 1 changesets with 0 changes to 1 files (+1 heads) remote: 1 new obsolescence markers remote: obsoleted 1 changesets $ hg -R ../other pull @@ -148,8 +148,8 @@ adding changesets adding manifests adding file changes + added 1 changesets with 0 changes to 1 files (+1 heads) obsmarker-exchange: 183 bytes received - added 1 changesets with 0 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets new changesets * (glob)