--- a/tests/test-amend.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-amend.t Wed Apr 08 01:16:53 2020 +0800
@@ -212,12 +212,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-discovery-hidden-common.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-discovery-hidden-common.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-discovery-obshashrange-cache.t Wed Apr 08 01:16:53 2020 +0800
@@ -33,21 +33,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-discovery-obshashrange.t Wed Apr 08 01:16:53 2020 +0800
@@ -66,15 +66,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'}
@@ -188,7 +183,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 (?)
@@ -237,14 +231,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)
1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)
@@ -278,9 +272,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
@@ -373,7 +365,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)
@@ -421,9 +413,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
@@ -517,9 +507,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
@@ -600,7 +588,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
@@ -685,7 +672,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
@@ -770,7 +756,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
@@ -833,7 +818,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
@@ -1158,6 +1142,7 @@
[1]
$ hg debugupdatecache --debug
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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-evolve-templates.t Wed Apr 08 01:16:53 2020 +0800
@@ -1107,14 +1107,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
---------------
@@ -1293,7 +1290,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A5.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A6.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-A7.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-B5.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-B6.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-C2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-C3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-C4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-D1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-D2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-D3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-exchange-obsmarkers-case-D4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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-obsolete.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-obsolete.t Wed Apr 08 01:16:53 2020 +0800
@@ -33,7 +33,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'}
@@ -98,7 +97,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
@@ -217,7 +215,6 @@
1 new orphan changesets
created new head
$ hg debugobsolete `getid 5` `getid 6`
- 1 new obsolescence markers
obsoleted 1 changesets
$ qlog
6
@@ -277,7 +274,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 .
@@ -369,7 +365,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
@@ -433,7 +428,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
@@ -458,7 +452,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
@@ -569,7 +562,6 @@
$ mkcommit "obsol_d'''"
created new head
$ hg debugobsolete `getid 11` `getid 12`
- 1 new obsolescence markers
obsoleted 1 changesets
$ hg push ../other-new --traceback
pushing to ../other-new
@@ -696,7 +688,6 @@
phases: 3 draft
phase-divergent: 1 changesets
$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
- 1 new obsolescence markers
2 new content-divergent changesets
$ hg log -r 'contentdivergent()'
changeset: 12:6db5e282cb91
--- a/tests/test-pullbundle.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-pullbundle.t Wed Apr 08 01:16:53 2020 +0800
@@ -118,6 +118,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
bundle2-input: part header size: 43
bundle2-input: part type: "CHANGEGROUP"
@@ -130,6 +131,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
bundle2-input: part header size: 42
bundle2-input: part type: "CHANGEGROUP"
@@ -142,6 +144,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
bundle2-input: part header size: 42
bundle2-input: part type: "CHANGEGROUP"
@@ -154,6 +157,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
bundle2-input: part header size: 41
bundle2-input: part type: "CHANGEGROUP"
@@ -166,6 +170,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
bundle2-input: part header size: 41
bundle2-input: part type: "CHANGEGROUP"
@@ -178,6 +183,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
bundle2-input: part header size: 18
bundle2-input: part type: "PHASE-HEADS"
@@ -199,10 +205,9 @@
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
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)
@@ -239,7 +244,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
@@ -316,58 +321,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)
@@ -425,22 +447,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)
@@ -465,7 +492,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
@@ -488,58 +515,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)
@@ -591,15 +635,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)
@@ -615,19 +663,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)
@@ -681,7 +733,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
@@ -723,52 +775,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)
@@ -845,52 +912,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)
@@ -958,25 +1040,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
@@ -1015,61 +1101,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)
@@ -1091,52 +1195,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-mixed-branch-topic-G1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft)[Z]: B1
--- a/tests/test-push-checkheads-mixed-branch-topic-G2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-mixed-branch-topic-G2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C1
--- a/tests/test-push-checkheads-mixed-branch-topic-G3.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-mixed-branch-topic-G3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C1
--- a/tests/test-push-checkheads-multi-topics-F1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multi-topics-F1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft)[Z]: B1
--- a/tests/test-push-checkheads-multi-topics-F2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multi-topics-F2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft)[Y]: C1
--- a/tests/test-push-checkheads-multi-topics-F3.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multi-topics-F3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft)[Y]: C1
--- a/tests/test-push-checkheads-multibranches-E1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multibranches-E1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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
@ c98b855401e7 (draft): B1
--- a/tests/test-push-checkheads-multibranches-E2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multibranches-E2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C1
--- a/tests/test-push-checkheads-multibranches-E3.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-multibranches-E3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C1
--- a/tests/test-push-checkheads-partial-C1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-partial-C1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-partial-C2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-partial-C2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-partial-C3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C0
--- a/tests/test-push-checkheads-partial-C4.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-partial-C4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B0
--- a/tests/test-push-checkheads-pruned-B2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-pruned-B3.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-pruned-B4.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C0
--- a/tests/test-push-checkheads-pruned-B5.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B5.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-pruned-B6.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B6.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-pruned-B7.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B7.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-pruned-B8.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-pruned-B8.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A2
--- a/tests/test-push-checkheads-superceed-A1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-superceed-A2.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-superceed-A3.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-superceed-A4.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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-superceed-A5.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A5.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A1
--- a/tests/test-push-checkheads-superceed-A6.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A6.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-superceed-A7.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A7.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-superceed-A8.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-superceed-A8.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): A2
--- a/tests/test-push-checkheads-unpushed-D1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D2.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-unpushed-D4.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-unpushed-D5.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D5.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): B1
--- a/tests/test-push-checkheads-unpushed-D6.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D6.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C0
--- a/tests/test-push-checkheads-unpushed-D7.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-push-checkheads-unpushed-D7.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 (draft): C0
--- a/tests/test-single-head-obsolescence-named-branch-A1.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-named-branch-A1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-named-branch-A2.t Wed Apr 08 01:16:53 2020 +0800
@@ -72,7 +72,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
@@ -100,6 +99,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-named-branch-A3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-named-branch-A4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-named-branch-A5.t Wed Apr 08 01:16:53 2020 +0800
@@ -78,7 +78,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
@@ -106,6 +105,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B1.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B2.t Wed Apr 08 01:16:53 2020 +0800
@@ -80,7 +80,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
@@ -108,6 +107,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B3.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B4.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-single-head-obsolescence-topic-B5.t Wed Apr 08 01:16:53 2020 +0800
@@ -82,7 +82,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
@@ -110,6 +109,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-topic-flow-reject-untopiced.t Wed Apr 08 01:16:53 2020 +0800
@@ -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: 4e8b0e0237
@@ -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: 4e8b0e0237
@@ -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: 4e8b0e0237
@@ -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: 4e8b0e0237
--- a/tests/test-topic-flow-single-head.t Wed Apr 08 01:16:51 2020 +0800
+++ b/tests/test-topic-flow-single-head.t Wed Apr 08 01:16:53 2020 +0800
@@ -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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-topic-tutorial.t Wed Apr 08 01:16:53 2020 +0800
@@ -477,7 +477,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 Apr 08 01:16:51 2020 +0800
+++ b/tests/test-wireproto.t Wed Apr 08 01:16:53 2020 +0800
@@ -72,8 +72,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
@@ -91,8 +91,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)
@@ -116,8 +116,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
@@ -125,8 +125,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)
@@ -140,8 +140,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
@@ -150,8 +150,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)