Patchwork [1,of,5] debugobsolete: also issue the "new obsmarkers" messsage

login
register
mail settings
Submitter Pierre-Yves David
Date Sept. 8, 2019, 7:45 a.m.
Message ID <d7d52b453d9e3689b0d4.1567928759@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/41564/
State Accepted
Headers show

Comments

Pierre-Yves David - Sept. 8, 2019, 7:45 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1539515964 -7200
#      Sun Oct 14 13:19:24 2018 +0200
# Node ID d7d52b453d9e3689b0d47685f163832ed2b20eae
# Parent  69195b6f8f974ba56aec9b9bd4cd0a259a646f72
# EXP-Topic check-summary
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r d7d52b453d9e
debugobsolete: also issue the "new obsmarkers" messsage

We are going to improve the way this message is issued in the core codebase.
This will make it appears for `hg debugobsolete` too. Since this seems like a
good idea, we make the output change in a previous changesets to clarify the
next changeset.

Patch

diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1766,6 +1766,7 @@  def debugobsolete(ui, repo, precursor=No
                 repo.obsstore.create(tr, prec, succs, opts['flags'],
                                      parents=parents, date=date,
                                      metadata=metadata, ui=ui)
+                repo.ui.status(('1 new obsolescence markers\n'))
                 tr.close()
             except ValueError as exc:
                 raise error.Abort(_('bad obsmarker input: %s') %
diff --git a/tests/test-bisect.t b/tests/test-bisect.t
--- a/tests/test-bisect.t
+++ b/tests/test-bisect.t
@@ -581,6 +581,7 @@  tip is obsolete
 ---------------------
 
   $ hg debugobsolete `hg id --debug -i -r tip`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg bisect --reset
   $ hg bisect --good 15
@@ -609,6 +610,7 @@  Rewritten commits should not crash
   $ hg commit -m 'msg 30 -- fixed'
   created new head
   $ hg debugobsolete `hg id --debug -i -r 30` `hg id --debug -i -r .`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg bisect
   The first bad revision is:
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -742,6 +742,7 @@  diverging a remote bookmark fails
 Unrelated marker does not alter the decision
 
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+  1 new obsolescence markers
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
@@ -763,8 +764,10 @@  Update to a successor works
   $ hg id --debug -r 5
   c922c0139ca03858f655e4a2af4dd02796a63969 tip Y
   $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f
+  1 new obsolescence markers
   $ hg push http://localhost:$HGPORT2/
   pushing to http://localhost:$HGPORT2/
   searching for changes
diff --git a/tests/test-bundle2-exchange.t b/tests/test-bundle2-exchange.t
--- a/tests/test-bundle2-exchange.t
+++ b/tests/test-bundle2-exchange.t
@@ -74,10 +74,12 @@  Real world exchange
 Add more obsolescence information
 
   $ hg -R main debugobsolete -d '0 0' 1111111111111111111111111111111111111111 `getmainid 9520eea781bc`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft 
   postclose-tip:02de42196ebe draft 
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
   $ hg -R main debugobsolete -d '0 0' 2222222222222222222222222222222222222222 `getmainid 24b6387c8c8c`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft 
   postclose-tip:02de42196ebe draft 
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
@@ -192,6 +194,7 @@  add extra data to test their exchange du
   postclose-tip:02de42196ebe draft 
   txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
   $ hg -R main debugobsolete -d '0 0' 3333333333333333333333333333333333333333 `getmainid eea13746799a`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft 
   postclose-tip:02de42196ebe draft 
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
@@ -200,6 +203,7 @@  add extra data to test their exchange du
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
   $ hg -R main debugobsolete -d '0 0' 4444444444444444444444444444444444444444 `getmainid 02de42196ebe`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft book_02de
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
@@ -208,6 +212,7 @@  add extra data to test their exchange du
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
   $ hg -R main debugobsolete -d '0 0' 5555555555555555555555555555555555555555 `getmainid 42ccdea3bb16`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft book_02de
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
@@ -216,6 +221,7 @@  add extra data to test their exchange du
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
   $ hg -R main debugobsolete -d '0 0' 6666666666666666666666666666666666666666 `getmainid 5fddd98957c8`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft book_02de
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
@@ -224,6 +230,7 @@  add extra data to test their exchange du
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_BOOKMARK_MOVED=1 HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_TXNID=TXN:$ID$ HG_TXNNAME=bookmark
   $ hg -R main debugobsolete -d '0 0' 7777777777777777777777777777777777777777 `getmainid 32af7686d403`
+  1 new obsolescence markers
   pre-close-tip:02de42196ebe draft book_02de
   postclose-tip:02de42196ebe draft book_02de
   txnclose hook: HG_HOOKNAME=txnclose.env HG_HOOKTYPE=txnclose HG_NEW_OBSMARKERS=1 HG_TXNID=TXN:$ID$ HG_TXNNAME=debugobsolete
diff --git a/tests/test-cache-abuse.t b/tests/test-cache-abuse.t
--- a/tests/test-cache-abuse.t
+++ b/tests/test-cache-abuse.t
@@ -24,6 +24,7 @@  Build a repo with some cacheable bits:
   $ echo dumb > dumb
   $ hg ci -qAmdumb
   $ hg debugobsolete b1174d11b69e63cb0c5726621a43c859f0858d7f
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg phase -pr t1
diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
--- a/tests/test-clone-uncompressed.t
+++ b/tests/test-clone-uncompressed.t
@@ -537,6 +537,7 @@  Clone non-publishing with obsolescence
   $ echo foo > foo
   $ hg -q commit -m 'about to be pruned'
   $ hg debugobsolete `hg log -r . -T '{node}'` -d '0 0' -u test --record-parents
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up null -q
   $ hg log -T '{rev}: {phase}\n'
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -759,6 +759,7 @@  Create repositories to test auto sharing
   $ echo initial2 > foo
   $ hg -q commit -A -m initial1
   $ hg debugobsolete c05d5c47a5cf81401869999f3d05f7d699d2b29a e082c1832e09a7d1e78b7fd49a592d372de854c8
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -549,6 +549,7 @@  changelog and manifest would have invali
   *** runcommand up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   *** runcommand phase -df tip
+  1 new obsolescence markers
   obsoleted 1 changesets
   *** runcommand log --hidden
   changeset:   1:731265503d86
diff --git a/tests/test-exchange-obsmarkers-case-A1.t b/tests/test-exchange-obsmarkers-case-A1.t
--- a/tests/test-exchange-obsmarkers-case-A1.t
+++ b/tests/test-exchange-obsmarkers-case-A1.t
@@ -53,6 +53,7 @@  initial
   $ cd main
   $ mkcommit A
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+  1 new obsolescence markers
   $ hg log -G
   @  f5bc6836db60 (draft): A
   |
@@ -201,6 +202,7 @@  initial
   o  a9bdc8b26820 (public): O
   
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A)'`
+  1 new obsolescence markers
   $ inspect_obsmarkers
   obsstore content
   ================
diff --git a/tests/test-exchange-obsmarkers-case-A2.t b/tests/test-exchange-obsmarkers-case-A2.t
--- a/tests/test-exchange-obsmarkers-case-A2.t
+++ b/tests/test-exchange-obsmarkers-case-A2.t
@@ -56,11 +56,13 @@  initial
   $ 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
   |
diff --git a/tests/test-exchange-obsmarkers-case-A3.t b/tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t
+++ b/tests/test-exchange-obsmarkers-case-A3.t
@@ -73,9 +73,11 @@  initial
   $ 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
@@ -163,9 +165,11 @@  other variant: changeset known in remote
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-A4.t b/tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t
+++ b/tests/test-exchange-obsmarkers-case-A4.t
@@ -63,7 +63,9 @@  initial
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-A5.t b/tests/test-exchange-obsmarkers-case-A5.t
--- a/tests/test-exchange-obsmarkers-case-A5.t
+++ b/tests/test-exchange-obsmarkers-case-A5.t
@@ -65,9 +65,12 @@  initial
   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
diff --git a/tests/test-exchange-obsmarkers-case-A6.t b/tests/test-exchange-obsmarkers-case-A6.t
--- a/tests/test-exchange-obsmarkers-case-A6.t
+++ b/tests/test-exchange-obsmarkers-case-A6.t
@@ -64,6 +64,7 @@  make both changeset known in remote
 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
diff --git a/tests/test-exchange-obsmarkers-case-A7.t b/tests/test-exchange-obsmarkers-case-A7.t
--- a/tests/test-exchange-obsmarkers-case-A7.t
+++ b/tests/test-exchange-obsmarkers-case-A7.t
@@ -51,6 +51,7 @@  Initial
   $ 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
   |
diff --git a/tests/test-exchange-obsmarkers-case-B5.t b/tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t
+++ b/tests/test-exchange-obsmarkers-case-B5.t
@@ -70,10 +70,13 @@  initial
   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
diff --git a/tests/test-exchange-obsmarkers-case-B6.t b/tests/test-exchange-obsmarkers-case-B6.t
--- a/tests/test-exchange-obsmarkers-case-B6.t
+++ b/tests/test-exchange-obsmarkers-case-B6.t
@@ -57,6 +57,7 @@  Initial
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-C2.t b/tests/test-exchange-obsmarkers-case-C2.t
--- a/tests/test-exchange-obsmarkers-case-C2.t
+++ b/tests/test-exchange-obsmarkers-case-C2.t
@@ -62,6 +62,7 @@  Itinial
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-C3.t b/tests/test-exchange-obsmarkers-case-C3.t
--- a/tests/test-exchange-obsmarkers-case-C3.t
+++ b/tests/test-exchange-obsmarkers-case-C3.t
@@ -64,6 +64,7 @@  Initial
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-C4.t b/tests/test-exchange-obsmarkers-case-C4.t
--- a/tests/test-exchange-obsmarkers-case-C4.t
+++ b/tests/test-exchange-obsmarkers-case-C4.t
@@ -65,8 +65,10 @@  Implemented as the non-split version
   $ 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
diff --git a/tests/test-exchange-obsmarkers-case-D1.t b/tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t
+++ b/tests/test-exchange-obsmarkers-case-D1.t
@@ -61,9 +61,11 @@  initial
   $ 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)'
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg strip --hidden -q 'desc(A0)'
   $ hg log -G --hidden
diff --git a/tests/test-exchange-obsmarkers-case-D2.t b/tests/test-exchange-obsmarkers-case-D2.t
--- a/tests/test-exchange-obsmarkers-case-D2.t
+++ b/tests/test-exchange-obsmarkers-case-D2.t
@@ -54,8 +54,10 @@  Initial
   $ 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' .
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg strip --hidden -q 'desc(A1)'
   $ hg log -G --hidden
diff --git a/tests/test-exchange-obsmarkers-case-D3.t b/tests/test-exchange-obsmarkers-case-D3.t
--- a/tests/test-exchange-obsmarkers-case-D3.t
+++ b/tests/test-exchange-obsmarkers-case-D3.t
@@ -57,8 +57,10 @@  initial
   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' .
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg strip --hidden -q 'desc(A1)'
   $ hg log -G --hidden
diff --git a/tests/test-exchange-obsmarkers-case-D4.t b/tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t
+++ b/tests/test-exchange-obsmarkers-case-D4.t
@@ -59,12 +59,16 @@  initial
   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
   |
diff --git a/tests/test-fix.t b/tests/test-fix.t
--- a/tests/test-fix.t
+++ b/tests/test-fix.t
@@ -1103,6 +1103,7 @@  obsolete revision.
   $ printf "foo\n" > foo.changed
   $ hg commit -Aqm "foo"
   $ hg debugobsolete `hg parents --template '{node}'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg --hidden fix -r 0
   abort: fixing obsolete revision could cause divergence
diff --git a/tests/test-glog-beautifygraph.t b/tests/test-glog-beautifygraph.t
--- a/tests/test-glog-beautifygraph.t
+++ b/tests/test-glog-beautifygraph.t
@@ -2426,6 +2426,7 @@  Test --hidden
   > EOF
 
   $ hg debugobsolete `hg id --debug -i -r 8`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ testlog
   []
diff --git a/tests/test-glog.t b/tests/test-glog.t
--- a/tests/test-glog.t
+++ b/tests/test-glog.t
@@ -2276,6 +2276,7 @@  Test --hidden
   > EOF
 
   $ hg debugobsolete `hg id --debug -i -r 8`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ testlog
   []
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -332,6 +332,7 @@  process.
   > evolution.createmarkers=True
   > EOF
   $ hg debugobsolete `hg log -r tip -T "{node}"`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -1941,6 +1941,7 @@  enable obsolete to test hidden feature
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up null -q
   $ hg log --template='{rev}:{node}\n'
@@ -1995,6 +1996,7 @@  test hidden revision 0 (issue5385)
   $ hg bookmark -d X@foo
   $ hg up null -q
   $ hg debugobsolete 9f758d63dcde62d547ebfb08e1e7ee96535f2b05
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ echo f > b
   $ hg ci -Am'b' -d '2 0'
@@ -2470,6 +2472,7 @@  Test that we use the first non-hidden ch
   $ hg log -T '{node}\n' -r 1
   2294ae80ad8447bc78383182eeac50cb049df623
   $ hg debugobsolete 2294ae80ad8447bc78383182eeac50cb049df623
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G
   o  changeset:   4:50b9b36e9c5d
@@ -2520,6 +2523,7 @@  Even when a head revision is linkrev-sha
   $ hg log -T '{node}\n' -r 4
   50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
   $ hg debugobsolete 50b9b36e9c5df2c6fc6dcefa8ad0da929e84aed2
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G a
   @  changeset:   3:15b2327059e5
diff --git a/tests/test-narrow.t b/tests/test-narrow.t
--- a/tests/test-narrow.t
+++ b/tests/test-narrow.t
@@ -157,6 +157,7 @@  Pruned commits affecting removed paths s
   $ hg co '.^'
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg debugobsolete `hg log -T '{node}' -r 'desc("local change to d0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg tracked --removeinclude d0
   comparing with ssh://user@dummy/master
diff --git a/tests/test-obshistory.t b/tests/test-obshistory.t
--- a/tests/test-obshistory.t
+++ b/tests/test-obshistory.t
@@ -88,6 +88,7 @@  Test setup
      summary:     ROOT
   
   $ hg debugobsolete --record-parents `getid 'desc(B0)'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -162,6 +163,7 @@  Test setup
   adding b
 
   $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -251,6 +253,7 @@  Test setup
   adding d
 
   $ hg debugobsolete `getid '1'` `getid '2'` `getid '3'` `getid '4'` `getid '5'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -336,9 +339,11 @@  Test setup
   created new head
 
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
+  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 log --hidden -G
@@ -507,9 +512,11 @@  Test setup
   created new head
 
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
diff --git a/tests/test-obsmarker-template.t b/tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t
+++ b/tests/test-obsmarker-template.t
@@ -387,6 +387,7 @@  Test templates with splitted commit
   $ hg commit -A -m "A0"
   adding b
   $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -593,9 +594,11 @@  Simulate a fold
   adding B0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
+  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 log --hidden -G
@@ -1120,9 +1123,11 @@  Test setup
   adding B0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -1601,11 +1606,14 @@  Test setup
 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
 ---------------
@@ -1854,6 +1862,7 @@  Split it
      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
@@ -2301,6 +2310,7 @@  Test setup
   $ mkcommit ROOT
   $ mkcommit A0
   $ hg debugobsolete --record-parent `getid "."`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 Check output
@@ -2330,6 +2340,7 @@  Test setup
   $ mkcommit A0
   $ hg commit --amend -m "A1"
   $ hg debugobsolete --record-parent `getid "."`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg up -r "desc(A0)" --hidden
@@ -2338,6 +2349,7 @@  Test setup
   (hidden revision '471f378eab4c' is pruned)
   $ hg commit --amend -m "A2"
   $ hg debugobsolete --record-parent `getid "."`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 Check output
@@ -2481,10 +2493,12 @@  Test templates with splitted and pruned 
   $ hg commit -A -m "A2"
   adding b
   $ hg debugobsolete `getid "1"` `getid "2"` `getid "3"`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 # Simulate prune
   $ hg debugobsolete --record-parent `getid "."`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg log --hidden -G
@@ -2622,6 +2636,7 @@  Test metadata encoding (issue5754)
   > --config devel.user.obsmarker="`cat test2`"
   $ mkcommit B0
   $ HGENCODING=latin-1 hg debugobsolete -u "`cat test2`" "`getid 'desc(B0)'`"
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 metadata should be stored in UTF-8, and debugobsolete doesn't decode it to
diff --git a/tests/test-obsolete-bundle-strip.t b/tests/test-obsolete-bundle-strip.t
--- a/tests/test-obsolete-bundle-strip.t
+++ b/tests/test-obsolete-bundle-strip.t
@@ -126,9 +126,12 @@  setup
   $ mkcommit 'C-A1'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`
+  1 new obsolescence markers
 
   $ hg up 'desc("ROOT")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -272,10 +275,13 @@  setup
   $ mkcommit 'C-A1'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up 'desc("ROOT")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -461,9 +467,12 @@  setup
   $ mkcommit 'C-A1'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+  1 new obsolescence markers
   $ hg up 'desc("ROOT")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log --hidden -G
@@ -606,10 +615,13 @@  setup
   $ mkcommit 'C-A1'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
@@ -688,9 +700,12 @@  setup
   $ mkcommit 'C-A1'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
+  1 new obsolescence markers
 
 (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)
 
@@ -775,20 +790,29 @@  setup
   $ mkcommit 'C-E'
   created new head
   $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`
+  1 new obsolescence markers
   $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
+  1 new obsolescence markers
   3 new content-divergent changesets
   $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
+  1 new obsolescence markers
   $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
+  1 new obsolescence markers
   1 new content-divergent changesets
   $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`
+  1 new obsolescence markers
 
   $ hg up 'desc("ROOT")'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -1334,6 +1358,7 @@  setup
   $ mkcommit 'C-A'
   $ mkcommit 'C-B'
   $ hg debugobsolete --record-parent `getid 'desc("C-B")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg up 'desc("ROOT")'
diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t
--- a/tests/test-obsolete-changeset-exchange.t
+++ b/tests/test-obsolete-changeset-exchange.t
@@ -34,6 +34,7 @@  extinct changeset.
   o  base d20a80d4def38df63a4b330b7fb688f3d4cae1e3
   
   $ hg debugobsolete 9d73aac1b2ed7d53835eaeec212ed41ea47da53a f89bcc95eba5174b1ccc3e33a82e84c96e8338ee
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 Push it. The bundle should not refer to the extinct changeset.
@@ -139,6 +140,7 @@  server obsoletes the old head
   $ echo 2b > foo
   $ hg -q commit -m 2b
   $ hg debugobsolete 6a29ed9c68defff1a139e5c6fa9696fb1a75783d bec0734cd68e84477ba7fc1d13e6cff53ab70129
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
diff --git a/tests/test-obsolete-checkheads.t b/tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t
+++ b/tests/test-obsolete-checkheads.t
@@ -47,6 +47,7 @@  setup
   $ mkcommit new
   created new head
   $ hg debugobsolete --flags 1 `getid old` `getid new`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  71e3228bffe1 (draft) add new
@@ -190,6 +191,7 @@  setup. (The obsolete marker is known loc
   $ mkcommit desc2
   created new head
   $ hg debugobsolete `getid old` `getid new`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  5fe37041cc2b (draft) add desc2
@@ -247,6 +249,7 @@  setup
   $ hg  id --debug -r tip
   71e3228bffe1886550777233d6c97bb5a6b2a650 tip
   $ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
+  1 new obsolescence markers
   $ hg log -G --hidden
   @  71e3228bffe1 (draft) add new
   |
@@ -301,6 +304,7 @@  setup
   $ mkcommit new-unrelated
   created new head
   $ hg debugobsolete `getid old`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  350a93b716be (draft) add new-unrelated
diff --git a/tests/test-obsolete-distributed.t b/tests/test-obsolete-distributed.t
--- a/tests/test-obsolete-distributed.t
+++ b/tests/test-obsolete-distributed.t
@@ -50,6 +50,7 @@  Initial setup
   $ mkcommit c_B0
   created new head
   $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden -v
   @  3:e5d7dda7cd28 c_B0
@@ -82,6 +83,7 @@  server side: create new revision on the 
   $ mkcommit c_B1
   created new head
   $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G
   @  4:391a2bf12b1b c_B1
@@ -111,6 +113,7 @@  client side: create a marker between two
 
   $ cd client
   $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G
   @  3:e5d7dda7cd28 c_B0
@@ -537,6 +540,7 @@  Setup
   $ cd repo-a
   $ hg debugbuilddag ..
   $ hg debugobsolete `getid tip`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ../
   $ hg clone --pull repo-a repo-b
diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t
--- a/tests/test-obsolete-divergent.t
+++ b/tests/test-obsolete-divergent.t
@@ -64,8 +64,10 @@  A_1 have two direct and divergent succes
 
   $ newcase direct
   $ hg debugobsolete `getid A_0` `getid A_1`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
+  1 new obsolescence markers
   2 new content-divergent changesets
   $ hg log -G --hidden
   *  3:392fd25390da A_2
@@ -124,12 +126,15 @@  indirect divergence with known changeset
 
   $ newcase indirect_known
   $ hg debugobsolete `getid A_0` `getid A_1`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
+  1 new obsolescence markers
   2 new content-divergent changesets
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_2` `getid A_3`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  4:01f36c5a8fda A_3
@@ -184,9 +189,12 @@  indirect divergence with known changeset
 
   $ newcase indirect_unknown
   $ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
+  1 new obsolescence markers
   $ hg debugobsolete `getid A_0` `getid A_2`
+  1 new obsolescence markers
   2 new content-divergent changesets
   $ hg log -G --hidden
   *  3:392fd25390da A_2
@@ -234,12 +242,17 @@  do not take unknown node in account if t
 
   $ newcase final-unknown
   $ hg debugobsolete `getid A_0` `getid A_1`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_1` `getid A_2`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+  1 new obsolescence markers
   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
+  1 new obsolescence markers
   $ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
+  1 new obsolescence markers
 
   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   007dc284c1f8
@@ -256,14 +269,18 @@  divergence that converge again is not di
 
   $ newcase converged_divergence
   $ hg debugobsolete `getid A_0` `getid A_1`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_2`
+  1 new obsolescence markers
   2 new content-divergent changesets
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_1` `getid A_3`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_2` `getid A_3`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  4:01f36c5a8fda A_3
@@ -312,6 +329,7 @@  split is not divergences
 
   $ newcase split
   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   o  3:392fd25390da A_2
@@ -354,18 +372,21 @@  Even when subsequent rewriting happen
   $ mkcommit A_3
   created new head
   $ hg debugobsolete `getid A_1` `getid A_3`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_4
   created new head
   $ hg debugobsolete `getid A_2` `getid A_4`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit A_5
   created new head
   $ hg debugobsolete `getid A_4` `getid A_5`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   @  6:e442cfc57690 A_5
@@ -426,6 +447,7 @@  Check more complex obsolescence graft (w
   $ mkcommit B_0; hg up 0
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ hg debugobsolete `getid B_0` `getid A_2`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ mkcommit A_7; hg up 0
   created new head
@@ -434,11 +456,13 @@  Check more complex obsolescence graft (w
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ mkcommit A_9; hg up 0
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_5` `getid A_9`
+  1 new obsolescence markers
   4 new content-divergent changesets
   $ hg log -G --hidden
   *  10:bed64f5d2f5a A_9
@@ -547,10 +571,13 @@  fix the divergence
   created new head
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid A_9` `getid A_A`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_7` `getid A_A`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_8` `getid A_A`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G --hidden
   o  11:a139f71be9da A_A
@@ -675,8 +702,10 @@  successors-set. (report [A,B] not [A] + 
 
   $ newcase subset
   $ hg debugobsolete `getid A_0` `getid A_2`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
+  1 new obsolescence markers
   $ hg debugsuccessorssets --hidden 'desc('A_0')'
   007dc284c1f8
       82623d38b9ba 392fd25390da
diff --git a/tests/test-obsolete-tag-cache.t b/tests/test-obsolete-tag-cache.t
--- a/tests/test-obsolete-tag-cache.t
+++ b/tests/test-obsolete-tag-cache.t
@@ -59,6 +59,7 @@  Trigger tags cache population by doing s
 Hiding a non-tip changeset should change filtered hash and cause tags recompute
 
   $ hg debugobsolete -d '0 0' c3cb30f2d2cd0aae008cc91a07876e3c5131fd22 -u dummyuser
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg tags
@@ -81,8 +82,10 @@  Hiding a non-tip changeset should change
 Hiding another changeset should cause the filtered hash to change
 
   $ hg debugobsolete -d '0 0' d75775ffbc6bca1794d300f5571272879bd280da -u dummyuser
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete -d '0 0' 5f97d42da03fd56f3b228b03dfe48af5c0adf75b -u dummyuser
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg tags
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -52,6 +52,7 @@  Killing a single changeset without repla
   abort: changeset references must be full hexadecimal node identifiers
   [255]
   $ hg debugobsolete -d '0 0' `getid kill_me` -u babar
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete
   97b7c2d76b1845ed3eb988cd612611e72406cef0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'babar'}
@@ -88,6 +89,7 @@  Killing a single changeset with replacem
   created new head
   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
   $ hg debugobsolete --config format.obsstore-version=0 --flag 12 `getid original_c`  `getid new_c` -d '121 120'
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -r 'hidden()' --template '{rev}:{node|short} {desc}\n' --hidden
   2:245bde4270cd add original_c
@@ -112,6 +114,7 @@  do it again (it read the obsstore before
   $ mkcommit new_2_c
   created new head
   $ hg debugobsolete -d '1337 0' `getid new_c` `getid new_2_c`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete
   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
@@ -124,8 +127,10 @@  Register two markers with a missing node
   $ mkcommit new_3_c
   created new head
   $ hg debugobsolete -d '1338 0' `getid new_2_c` 1337133713371337133713371337133713371337
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete -d '1339 0' 1337133713371337133713371337133713371337 `getid new_3_c`
+  1 new obsolescence markers
   $ hg debugobsolete
   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
   cdbce2fbb16313928851e97e0d85413f3f7eb77f ca819180edb99ed25ceafb3e9584ac287e240b00 0 (Thu Jan 01 00:22:17 1970 +0000) {'user': 'test'}
@@ -264,6 +269,7 @@  We need to create a clone of 5 and add a
   $ hg ci -m 'add n3w_3_c'
   created new head
   $ hg debugobsolete -d '1338 0' --flags 1 `getid new_3_c` `getid n3w_3_c`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -r 'phasedivergent()'
   $ hg log -G
@@ -323,6 +329,7 @@  Revision 0 is hidden
   $ mkcommit kill0
   $ hg up -q null
   $ hg debugobsolete `getid kill0`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ mkcommit a
   $ mkcommit b
@@ -349,6 +356,7 @@  Can disable transaction summary report
   $ mkcommit b
   $ hg up -q null
   $ hg --config experimental.evolution.report-instabilities=false debugobsolete `getid a`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ cd ..
 
@@ -392,6 +400,7 @@  Try to pull markers
 Rollback//Transaction support
 
   $ hg debugobsolete -d '1340 0' aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+  1 new obsolescence markers
   $ hg debugobsolete
   1337133713371337133713371337133713371337 5601fb93a350734d935195fee37f4054c529ff39 0 (Thu Jan 01 00:22:19 1970 +0000) {'user': 'test'}
   245bde4270cd1072a27757984f9cda8ba26f08ca cdbce2fbb16313928851e97e0d85413f3f7eb77f C (Thu Jan 01 00:00:01 1970 -0002) {'user': 'test'}
@@ -478,6 +487,7 @@  On pull
   $ hg init tmpe
   $ cd tmpe
   $ hg debugobsolete -d '1339 0' 1339133913391339133913391339133913391339 ca819180edb99ed25ceafb3e9584ac287e240b00
+  1 new obsolescence markers
   $ hg pull ../tmpb
   pulling from ../tmpb
   requesting all changes
@@ -531,6 +541,7 @@  detect outgoing obsolete and unstable
   $ mkcommit original_d
   $ mkcommit original_e
   $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg debugobsolete | grep `getid original_d`
@@ -627,6 +638,7 @@  Do not warn about new head when the new 
   created new head
   $ hg debugobsolete `getid 'original_e'` `getid 'obsolete_e'` \
   > -u 'test <test@example.net>'
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg outgoing ../tmpf # parasite hg outgoing testin
   comparing with ../tmpf
@@ -812,65 +824,125 @@  check hgweb does not explode
   > do
   >    hg debugobsolete $node
   > done
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up tip
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -938,9 +1010,11 @@  reenable for later test
 Several troubles on the same changeset (create an unstable and bumped and content-divergent changeset)
 
   $ hg debugobsolete `getid obsolete_e`
+  1 new obsolescence markers
   obsoleted 1 changesets
   2 new orphan changesets
   $ hg debugobsolete `getid original_c` `getid babar`
+  1 new obsolescence markers
   1 new phase-divergent changesets
   2 new content-divergent changesets
   $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan() and contentdivergent()'
@@ -1309,6 +1383,7 @@  Test issue 4506
   grafting 1:1c9eddb02162 "content-1" (tip)
 
   $ hg debugobsolete `hg log -r1 -T'{node}'` `hg log -r2 -T'{node}'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
@@ -1610,6 +1685,7 @@  Test adding changeset after obsmarkers a
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/tmpe/issue4845/doindexrev/.hg/strip-backup/9bc153528424-ee80edd4-backup.hg
   $ hg debugobsolete 9bc153528424ea266d13e57f9ff0d799dfe61e4b
+  1 new obsolescence markers
   $ hg unbundle ../bundle-2.hg
   adding changesets
   adding manifests
diff --git a/tests/test-phases.t b/tests/test-phases.t
--- a/tests/test-phases.t
+++ b/tests/test-phases.t
@@ -638,6 +638,7 @@  test hidden changeset are not cloned as 
 
 (making a changeset hidden; H in that case)
   $ hg debugobsolete `hg id --debug -r 5`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ cd ..
diff --git a/tests/test-push-checkheads-partial-C1.t b/tests/test-push-checkheads-partial-C1.t
--- a/tests/test-push-checkheads-partial-C1.t
+++ b/tests/test-push-checkheads-partial-C1.t
@@ -60,6 +60,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-partial-C2.t b/tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t
+++ b/tests/test-push-checkheads-partial-C2.t
@@ -60,6 +60,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-partial-C3.t b/tests/test-push-checkheads-partial-C3.t
--- a/tests/test-push-checkheads-partial-C3.t
+++ b/tests/test-push-checkheads-partial-C3.t
@@ -60,6 +60,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-partial-C4.t b/tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t
+++ b/tests/test-push-checkheads-partial-C4.t
@@ -60,6 +60,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B1.t b/tests/test-push-checkheads-pruned-B1.t
--- a/tests/test-push-checkheads-pruned-B1.t
+++ b/tests/test-push-checkheads-pruned-B1.t
@@ -49,6 +49,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B2.t b/tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t
+++ b/tests/test-push-checkheads-pruned-B2.t
@@ -60,9 +60,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B3.t b/tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t
+++ b/tests/test-push-checkheads-pruned-B3.t
@@ -60,9 +60,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B4.t b/tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t
+++ b/tests/test-push-checkheads-pruned-B4.t
@@ -61,9 +61,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B5.t b/tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t
+++ b/tests/test-push-checkheads-pruned-B5.t
@@ -64,11 +64,14 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B6.t b/tests/test-push-checkheads-pruned-B6.t
--- a/tests/test-push-checkheads-pruned-B6.t
+++ b/tests/test-push-checkheads-pruned-B6.t
@@ -52,8 +52,10 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B7.t b/tests/test-push-checkheads-pruned-B7.t
--- a/tests/test-push-checkheads-pruned-B7.t
+++ b/tests/test-push-checkheads-pruned-B7.t
@@ -51,8 +51,10 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-pruned-B8.t b/tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t
+++ b/tests/test-push-checkheads-pruned-B8.t
@@ -67,13 +67,17 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-superceed-A1.t b/tests/test-push-checkheads-superceed-A1.t
--- a/tests/test-push-checkheads-superceed-A1.t
+++ b/tests/test-push-checkheads-superceed-A1.t
@@ -46,6 +46,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-superceed-A2.t b/tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t
+++ b/tests/test-push-checkheads-superceed-A2.t
@@ -60,9 +60,11 @@  Test setup
   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
diff --git a/tests/test-push-checkheads-superceed-A3.t b/tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t
+++ b/tests/test-push-checkheads-superceed-A3.t
@@ -63,9 +63,11 @@  Test setup
   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
diff --git a/tests/test-push-checkheads-superceed-A4.t b/tests/test-push-checkheads-superceed-A4.t
--- a/tests/test-push-checkheads-superceed-A4.t
+++ b/tests/test-push-checkheads-superceed-A4.t
@@ -48,6 +48,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-superceed-A5.t b/tests/test-push-checkheads-superceed-A5.t
--- a/tests/test-push-checkheads-superceed-A5.t
+++ b/tests/test-push-checkheads-superceed-A5.t
@@ -49,6 +49,7 @@  Test setup
   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
diff --git a/tests/test-push-checkheads-superceed-A6.t b/tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t
+++ b/tests/test-push-checkheads-superceed-A6.t
@@ -69,9 +69,11 @@  Test setup
   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
diff --git a/tests/test-push-checkheads-superceed-A7.t b/tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t
+++ b/tests/test-push-checkheads-superceed-A7.t
@@ -69,9 +69,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-superceed-A8.t b/tests/test-push-checkheads-superceed-A8.t
--- a/tests/test-push-checkheads-superceed-A8.t
+++ b/tests/test-push-checkheads-superceed-A8.t
@@ -53,8 +53,10 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D1.t b/tests/test-push-checkheads-unpushed-D1.t
--- a/tests/test-push-checkheads-unpushed-D1.t
+++ b/tests/test-push-checkheads-unpushed-D1.t
@@ -49,6 +49,7 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D2.t b/tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t
+++ b/tests/test-push-checkheads-unpushed-D2.t
@@ -64,9 +64,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D3.t b/tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t
+++ b/tests/test-push-checkheads-unpushed-D3.t
@@ -67,9 +67,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D4.t b/tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t
+++ b/tests/test-push-checkheads-unpushed-D4.t
@@ -83,9 +83,11 @@  Test setup
   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
diff --git a/tests/test-push-checkheads-unpushed-D5.t b/tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t
+++ b/tests/test-push-checkheads-unpushed-D5.t
@@ -72,9 +72,11 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D6.t b/tests/test-push-checkheads-unpushed-D6.t
--- a/tests/test-push-checkheads-unpushed-D6.t
+++ b/tests/test-push-checkheads-unpushed-D6.t
@@ -56,8 +56,10 @@  Test setup
   $ 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
diff --git a/tests/test-push-checkheads-unpushed-D7.t b/tests/test-push-checkheads-unpushed-D7.t
--- a/tests/test-push-checkheads-unpushed-D7.t
+++ b/tests/test-push-checkheads-unpushed-D7.t
@@ -65,10 +65,13 @@  Test setup
   $ 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
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -1608,6 +1608,7 @@  Creating changesets and markers
   $ ID_Q=`hg -R client-racy log -T '{node}\n' -r 'desc("C-Q")'`
   $ ID_V=`hg -R client-racy log -T '{node}\n' -r 'desc("C-V")'`
   $ hg -R client-racy debugobsolete $ID_Q $ID_V
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 Pushing
@@ -1800,6 +1801,7 @@  Creating changesets and markers
   $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
   $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
   $ hg -R client-other debugobsolete $ID_V $ID_W
+  1 new obsolescence markers
   obsoleted 1 changesets
 
 (continue the same head)
diff --git a/tests/test-rebase-obsolete.t b/tests/test-rebase-obsolete.t
--- a/tests/test-rebase-obsolete.t
+++ b/tests/test-rebase-obsolete.t
@@ -651,6 +651,7 @@  Test hidden changesets in the rebase set
   $ hg commit -m J
   1 new orphan changesets
   $ hg debugobsolete `hg log --rev . -T '{node}'`
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
@@ -838,6 +839,7 @@  Even when the chain include missing node
   o  0:4a2df7238c3b A
   
   $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg rebase -d 6 -r "4::"
@@ -867,6 +869,7 @@  should display a friendly error message
   $ hg commit -m nonrelevant
   created new head
   $ hg debugobsolete `hg log -r 11 -T '{node}\n'` --config experimental.evolution=true
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G
   @  11:f44da1f4954c nonrelevant (pruned)
@@ -1007,6 +1010,7 @@  Create the changes that we will rebase
   $ hg add L
   $ hg commit -m "dummy change"
   $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
 
@@ -1276,6 +1280,7 @@  issue5782
   > EOF
   1 new orphan changesets
   $ hg debugobsolete `hg log -T "{node}" --hidden -r 'desc("c1")'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg log -G -r 'a': --hidden
   *  4:76be324c128b d
diff --git a/tests/test-remote-hidden.t b/tests/test-remote-hidden.t
--- a/tests/test-remote-hidden.t
+++ b/tests/test-remote-hidden.t
@@ -36,6 +36,7 @@  Testing the `served.hidden` view
   $ hg ci -m "c_Pruned"
   created new head
   $ hg debugobsolete --record-parents `getid 'desc("c_Pruned")'` -d '0 0'
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up ".^"
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -45,6 +46,7 @@  Testing the `served.hidden` view
   $ echo 5 > a
   $ hg ci -m "c_Secret_Pruned" --secret
   $ hg debugobsolete --record-parents `getid 'desc("c_Secret_Pruned")'` -d '0 0'
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up null
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff --git a/tests/test-revset.t b/tests/test-revset.t
--- a/tests/test-revset.t
+++ b/tests/test-revset.t
@@ -2003,6 +2003,7 @@  Test short 'ff...' hash collision
   4:ffff85cff0ff78504fcdc3c0bc10de0c65379249 ffff8
   2147483647:ffffffffffffffffffffffffffffffffffffffff fffff
   $ hg debugobsolete fffbae3886c8fbb2114296380d276fd37715d571
+  1 new obsolescence markers
   obsoleted 1 changesets
 
   $ hg debugrevspec 'fff'
diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -112,6 +112,7 @@  test bug 4073 we need to enable obsolete
   shelved as default
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `hg log -r 0e067c57feba -T '{node}'`
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg unshelve
   unshelving change 'default'
diff --git a/tests/test-show-work.t b/tests/test-show-work.t
--- a/tests/test-show-work.t
+++ b/tests/test-show-work.t
@@ -235,6 +235,7 @@  Obsolescence information appears in labe
   > evolution=createmarkers
   > EOF
   $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"`
+  1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
   $ hg show work --color=debug
diff --git a/tests/test-tag.t b/tests/test-tag.t
--- a/tests/test-tag.t
+++ b/tests/test-tag.t
@@ -434,6 +434,7 @@  issue5539: pruned tags do not appear in 
   abeb261f0508ecebcd345ce21e7a25112df417aa
 (mimic 'hg prune' command by obsoleting current changeset and then moving to its parent)
   $ hg debugobsolete abeb261f0508ecebcd345ce21e7a25112df417aa --record-parents
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up ".^" --quiet
   $ cat .hgtags
diff --git a/tests/test-template-functions.t b/tests/test-template-functions.t
--- a/tests/test-template-functions.t
+++ b/tests/test-template-functions.t
@@ -918,10 +918,13 @@  Test shortest(node) with the repo having
   9:c5623987d205cd6d9d8389bfc40fff9dbb670b48
   10:c562ddd9c94164376c20b86b0b4991636a3bf84f
   $ hg debugobsolete a00be79088084cb3aff086ab799f8790e01a976b
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete c5623987d205cd6d9d8389bfc40fff9dbb670b48
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete c562ddd9c94164376c20b86b0b4991636a3bf84f
+  1 new obsolescence markers
   obsoleted 1 changesets
 
  nodes starting with '11' (we don't have the revision number '11' though)
@@ -987,6 +990,7 @@  Test prefixhexnode when the first charac
   1:x0
 
   $ hg debugobsolete 0cf177ba2b1dc3862a00fb81715fec90950201be
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up -q 0
   $ echo 61 > a
diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -502,8 +502,10 @@  We add simple obsolescence marker betwee
   $ hg id --debug -i -r 4
   d047485b3896813b2a624e86201983520f003206
   $ hg debugobsolete 6efa171f091b00a3c35edc15d48c52a498929953 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa d047485b3896813b2a624e86201983520f003206
+  1 new obsolescence markers
 
 Test that 5 is detected as a valid destination from 3 and also accepts moving
 the bookmark (issue4015)
@@ -575,6 +577,7 @@  non-obsolete parent but that will be dec
   $ hg up --quiet 0
   $ hg up --quiet 2
   $ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
+  1 new obsolescence markers
   obsoleted 1 changesets
   $ hg up
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved