Mercurial > evolve

changeset 4872:7787baa5a6ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge back with stable version 9.2.0 have been released
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 28 Sep 2019 13:15:02 +0200
parents a8ff17479fb8 (diff) ca34404abaef (current diff)
children 77e8ca85d740
files hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py
diffstat 53 files changed, 142 insertions(+), 152 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py	Sat Sep 28 13:14:07 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Sat Sep 28 13:15:02 2019 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = b'9.2.1.dev'
+__version__ = b'9.3.0.dev'
 testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
 minimumhgversion = b'4.5'
 buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Sat Sep 28 13:14:07 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Sat Sep 28 13:15:02 2019 +0200
@@ -187,7 +187,7 @@
               b'topic.active': b'green',
               }
 
-__version__ = b'0.17.1.dev'
+__version__ = b'0.18.0.dev'
 
 testedwith = b'4.5.2 4.6.2 4.7 4.8 4.9 5.0 5.1'
 minimumhgversion = b'4.5'
--- a/tests/test-discovery-obshashrange-cache.t	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-discovery-obshashrange-cache.t	Sat Sep 28 13:15:02 2019 +0200
@@ -35,13 +35,21 @@
   >     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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-discovery-obshashrange.t	Sat Sep 28 13:15:02 2019 +0200
@@ -66,10 +66,15 @@
   
 
   $ 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'}
@@ -183,6 +188,7 @@
   $ 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 (?)
@@ -231,14 +237,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: 1 parts total
+  bundle2-input-bundle: 2 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)
@@ -272,7 +278,9 @@
   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
@@ -365,7 +373,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: 1 parts total (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> bundle2-input-bundle: 2 parts total (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending listkeys command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> received listkey for "phases": 58 bytes (glob)
@@ -413,7 +421,9 @@
   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
@@ -507,7 +517,9 @@
              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
@@ -588,6 +600,7 @@
              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
@@ -672,6 +685,7 @@
              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
@@ -756,6 +770,7 @@
 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
@@ -818,6 +833,7 @@
 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
@@ -1142,7 +1158,6 @@
   [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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-evolve-templates.t	Sat Sep 28 13:15:02 2019 +0200
@@ -1105,11 +1105,14 @@
 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
 ---------------
@@ -1288,6 +1291,7 @@
      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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -53,6 +53,7 @@
   $ cd main
   $ mkcommit A
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+  1 new obsolescence markers
   $ hg log -G
   @  f5bc6836db60 (draft): A
   |
@@ -211,6 +212,7 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -56,11 +56,13 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -73,9 +73,11 @@
   $ 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
@@ -178,9 +180,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -63,7 +63,9 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t	Sat Sep 28 13:15:02 2019 +0200
@@ -65,9 +65,12 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A6.t	Sat Sep 28 13:15:02 2019 +0200
@@ -64,6 +64,7 @@
 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-A7.t	Sat Sep 28 13:15:02 2019 +0200
@@ -51,6 +51,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Sat Sep 28 13:15:02 2019 +0200
@@ -70,10 +70,13 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-B6.t	Sat Sep 28 13:15:02 2019 +0200
@@ -57,6 +57,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -62,6 +62,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-C3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -64,6 +64,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -65,8 +65,10 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -61,6 +61,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -54,6 +54,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -57,6 +57,7 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -59,12 +59,16 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-obsolete.t	Sat Sep 28 13:15:02 2019 +0200
@@ -33,6 +33,7 @@
   $ 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'}
@@ -97,6 +98,7 @@
   $ mkcommit "obsol_c'" # 4 (on 1)
   created new head
   $ hg debugobsolete `getid 3` `getid 4`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ qlog
   4
@@ -215,6 +217,7 @@
   1 new orphan changesets
   created new head
   $ hg debugobsolete `getid 5` `getid 6`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ qlog
   6
@@ -274,6 +277,7 @@
   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,6 +369,7 @@
   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
@@ -428,6 +433,7 @@
   $ 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
@@ -452,6 +458,7 @@
   - 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
@@ -562,6 +569,7 @@
   $ 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
@@ -688,6 +696,7 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-pullbundle.t	Sat Sep 28 13:15:02 2019 +0200
@@ -118,7 +118,6 @@
   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"
@@ -131,7 +130,6 @@
   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"
@@ -144,7 +142,6 @@
   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"
@@ -157,7 +154,6 @@
   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"
@@ -170,7 +166,6 @@
   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"
@@ -183,7 +178,6 @@
   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"
@@ -205,9 +199,10 @@
   bundle2-input-part: total payload size 24719
   bundle2-input: part header size: 0
   bundle2-input: end of bundle2 stream
-  bundle2-input-bundle: 7 parts total
+  bundle2-input-bundle: 8 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)
 
@@ -244,7 +239,7 @@
   $ hg -R client pull server --verbose
   pulling from server
   searching for changes
-  all local heads known remotely
+  all local changesets known remotely
   pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
   1 changesets found
   4 changesets found
@@ -321,75 +316,58 @@
   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 8 changesets with 0 changes to 0 files
+  added 896 changesets with 0 changes to 0 files (+1 heads)
   new changesets 17185c1c22f1:0f376356904f
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
@@ -447,27 +425,22 @@
   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 1 changesets with 0 changes to 0 files
+  added 1235 changesets with 0 changes to 0 files
   new changesets 1ea73414a91b:f864bc82f6a2
   (run 'hg update' to get a working copy)
 
@@ -492,7 +465,7 @@
   $ hg -R client2 pull server --verbose
   pulling from server
   searching for changes
-  all local heads known remotely
+  all local changesets known remotely
   pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
   1 changesets found in caches
   4 changesets found in caches
@@ -515,75 +488,58 @@
   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 8 changesets with 0 changes to 0 files
+  added 896 changesets with 0 changes to 0 files (+1 heads)
   new changesets 17185c1c22f1:0f376356904f
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
@@ -635,19 +591,15 @@
   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)
@@ -663,23 +615,19 @@
          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 1 changesets with 0 changes to 0 files
+  added 1523 changesets with 0 changes to 0 files
   new changesets 1ea73414a91b:44e80141ad53
   (run 'hg update' to get a working copy)
 
@@ -733,7 +681,7 @@
   $ hg -R client3 pull server --verbose
   pulling from server
   searching for changes
-  all local heads known remotely
+  all local changesets known remotely
   pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
   1 changesets found
   4 changesets found
@@ -775,67 +723,52 @@
   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 8 changesets with 0 changes to 0 files
+  added 608 changesets with 0 changes to 0 files (+1 heads)
   new changesets d1807e351389:0f376356904f
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
@@ -912,67 +845,52 @@
   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 8 changesets with 0 changes to 0 files
+  added 2131 changesets with 0 changes to 0 files (+1 heads)
   new changesets 1ea73414a91b:0f376356904f
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
@@ -1040,29 +958,25 @@
   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 1 changesets with 0 changes to 0 files (+1 heads)
+  added 901 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 heads known remotely
+  all local changesets known remotely
   pullbundle-cache: "missing" set sliced into 19 subranges in *.* seconds (glob)
   4 changesets found
   8 changesets found
@@ -1101,79 +1015,61 @@
   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 8 changesets with 0 changes to 0 files
+  added 1230 changesets with 0 changes to 0 files
   new changesets e600b80a2fc8:0f376356904f
   (run 'hg update' to get a working copy)
 
@@ -1195,67 +1091,52 @@
   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 8 changesets with 0 changes to 0 files
+  added 2131 changesets with 0 changes to 0 files (+1 heads)
   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-partial-C1.t	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-partial-C1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -58,6 +58,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-partial-C2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,6 +60,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-partial-C3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,6 +60,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-partial-C4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,6 +60,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -49,6 +49,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,9 +60,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,9 +60,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -61,9 +61,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t	Sat Sep 28 13:15:02 2019 +0200
@@ -64,11 +64,14 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B6.t	Sat Sep 28 13:15:02 2019 +0200
@@ -52,8 +52,10 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B7.t	Sat Sep 28 13:15:02 2019 +0200
@@ -51,8 +51,10 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t	Sat Sep 28 13:15:02 2019 +0200
@@ -67,13 +67,17 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -46,6 +46,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -60,9 +60,11 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -63,9 +63,11 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -48,6 +48,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A5.t	Sat Sep 28 13:15:02 2019 +0200
@@ -49,6 +49,7 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t	Sat Sep 28 13:15:02 2019 +0200
@@ -69,9 +69,11 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t	Sat Sep 28 13:15:02 2019 +0200
@@ -69,9 +69,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-superceed-A8.t	Sat Sep 28 13:15:02 2019 +0200
@@ -53,8 +53,10 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D1.t	Sat Sep 28 13:15:02 2019 +0200
@@ -49,6 +49,7 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t	Sat Sep 28 13:15:02 2019 +0200
@@ -64,9 +64,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t	Sat Sep 28 13:15:02 2019 +0200
@@ -67,9 +67,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Sat Sep 28 13:15:02 2019 +0200
@@ -83,9 +83,11 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t	Sat Sep 28 13:15:02 2019 +0200
@@ -72,9 +72,11 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D6.t	Sat Sep 28 13:15:02 2019 +0200
@@ -56,8 +56,10 @@
   $ 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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-push-checkheads-unpushed-D7.t	Sat Sep 28 13:15:02 2019 +0200
@@ -65,10 +65,13 @@
   $ 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-topic-flow-reject-untopiced.t	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-topic-flow-reject-untopiced.t	Sat Sep 28 13:15:02 2019 +0200
@@ -73,7 +73,6 @@
   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
@@ -85,7 +84,6 @@
   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
@@ -121,7 +119,6 @@
   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
@@ -139,7 +136,6 @@
   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	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-topic-flow-single-head.t	Sat Sep 28 13:15:02 2019 +0200
@@ -70,7 +70,6 @@
   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"
@@ -145,7 +144,6 @@
   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-wireproto.t	Sat Sep 28 13:14:07 2019 +0200
+++ b/tests/test-wireproto.t	Sat Sep 28 13:15:02 2019 +0200
@@ -72,8 +72,8 @@
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
+  remote: obsmarker-exchange: 92 bytes received
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: obsmarker-exchange: 92 bytes received
   remote: 1 new obsolescence markers
   remote: obsoleted 1 changesets
   $ hg push
@@ -91,8 +91,8 @@
   adding changesets
   adding manifests
   adding file changes
+  obsmarker-exchange: 92 bytes received
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  obsmarker-exchange: 92 bytes received
   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: obsmarker-exchange: 92 bytes received
   remote: added 1 changesets with 1 changes to 1 files
-  remote: obsmarker-exchange: 92 bytes received
   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
+  obsmarker-exchange: 92 bytes received
   added 1 changesets with 1 changes to 1 files
-  obsmarker-exchange: 92 bytes received
   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: obsmarker-exchange: 183 bytes received
   remote: added 1 changesets with 0 changes to 1 files (+1 heads)
-  remote: obsmarker-exchange: 183 bytes received
   remote: 1 new obsolescence markers
   remote: obsoleted 1 changesets
   $ hg -R ../other pull
@@ -150,8 +150,8 @@
   adding changesets
   adding manifests
   adding file changes
+  obsmarker-exchange: 183 bytes received
   added 1 changesets with 0 changes to 1 files (+1 heads)
-  obsmarker-exchange: 183 bytes received
   1 new obsolescence markers
   obsoleted 1 changesets
   new changesets * (glob)