# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1508517262 -7200
# Node ID 9c9c8c1eeb939dac3534f61bd960914c5523440d
# Parent  1f61525727bfbcb053d69907ec583b95e4614340# Parent  67b59d1657cfd4da6cdbde9df23dfaf9326d3844
test-compat: merge with mercurial-4.3 branch

diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-discovery-obshashrange.t
--- a/tests/test-discovery-obshashrange.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-discovery-obshashrange.t	Fri Oct 20 18:34:22 2017 +0200
@@ -34,9 +34,23 @@
   * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 0o) (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (8r, 0o) (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (8r, 0o) (glob)
   * @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
@@ -65,11 +79,11 @@
   $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0
   $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'`
   $ 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'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
+  eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 4de32a90b66cd083ebf3c00b41277aa7abca51dd 0 (*) {'user': 'test'} (glob)
 
   $ hg blackbox
   * @0000000000000000000000000000000000000000 (*)> log -G (glob)
@@ -146,25 +160,25 @@
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
   $ rm ../server/.hg/blackbox.log
   $ hg -R ../server/ debugobsolete --rev ::4 | sort
-  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'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
   $ rm ../server/.hg/blackbox.log
   $ hg blackbox
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 3o) (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated base branch cache in *.???? seconds (glob)
-  * @0000000000000000000000000000000000000000 (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (5r, 3o) (glob)
   * @0000000000000000000000000000000000000000 (*)> 5 incoming changes - new heads: bebd167eb94d (glob)
   * @0000000000000000000000000000000000000000 (*)> pull --rev 4 exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
   $ rm .hg/blackbox.log
   $ hg debugobsolete | sort
-  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'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
 
 testing simple push
 ===================
@@ -192,7 +206,7 @@
   taking quick initial sample
   query 2; still undecided: 5, sample size is: 5
   sending known command
-  2 total queries in *.????s (glob)
+  2 total queries
   preparing listkeys for "phases"
   sending listkeys command
   received listkey for "phases": 58 bytes
@@ -224,7 +238,7 @@
   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-bundle: with-transaction
   bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
   bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
   bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
@@ -234,12 +248,12 @@
   received listkey for "phases": 58 bytes
   $ hg -R ../server blackbox
   * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
+  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @0000000000000000000000000000000000000000 (*)> updated stablerange cache in *.???? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
-  * @0000000000000000000000000000000000000000 (*)> obscache is out of date, falling back to slower obsstore version (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated served branch cache in *.???? seconds (glob)
-  * @0000000000000000000000000000000000000000 (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
-  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+  * @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
   * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
@@ -281,12 +295,12 @@
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
   $ rm ../server/.hg/blackbox.log
   $ hg -R ../server/ debugobsolete --rev ::tip | sort
-  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  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'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (*) {'user': 'test'} (glob)
   $ hg blackbox
   * @0000000000000000000000000000000000000000 (*)> debugobsolete (glob)
   * @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
@@ -296,11 +310,10 @@
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> add foo exited 0 after *.?? seconds (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> commit -m foo (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated served branch cache in *.???? seconds (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 0o) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obscache is out of date, falling back to slower obsstore version (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 1 nodes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> commit -m foo exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
@@ -309,7 +322,6 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> found 1 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/5 mismatch - 1 obshashrange queries in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push -f --debug exited 0 after *.?? seconds (glob)
@@ -330,16 +342,16 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/6 mismatch - 1 obshashrange queries in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push exited 1 after *.?? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> push exited True after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
   $ rm .hg/blackbox.log
   $ hg debugobsolete | sort
-  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  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'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  ffffffffffffffffffffffffffffffffffffffff 45f8b879de922f6a6e620ba04205730335b6fc7e 0 (*) {'user': 'test'} (glob)
 
 testing pull with extra remote markers
 =====================================
@@ -393,14 +405,14 @@
   * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
   $ rm ../server/.hg/blackbox.log
   $ hg -R ../server/ debugobsolete --rev '::6' | sort
-  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+  aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
   $ hg blackbox
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobsolete (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
@@ -409,25 +421,26 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 2/6 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (2r, 0o) (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obshashcache reset - new markers affect cached ranges (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (2r, 3o) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (2r, 3o) (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 3o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 2 incoming changes - new heads: f69452c5b1af (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull -r 6 exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
   $ rm .hg/blackbox.log
   $ hg debugobsolete --rev '::6' | sort
-  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  22222222222222222bbbbbbbbbbbbb2222222222 2dc09a01254db841290af0538aa52f6f52c776e3 0 (*) {'user': 'test'} (glob)
+  aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (*) {'user': 'test'} (glob)
+  bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (*) {'user': 'test'} (glob)
+  cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (*) {'user': 'test'} (glob)
+  dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (*) {'user': 'test'} (glob)
 
 Test cache behavior
 ===================
@@ -554,18 +567,17 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated served branch cache in *.???? seconds (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 1 incoming changes - new heads: 4de32a90b66c (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated base branch cache in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (8r, 12o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> rollback exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
   $ rm .hg/blackbox.log
@@ -605,9 +617,11 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip detected, evo-ext-obscache cache reset (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (9r, 12o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated stablerange cache in *.???? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 1o) (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> 1 incoming changes - new heads: 4de32a90b66c (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> pull exited 0 after *.?? seconds (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> blackbox (glob)
@@ -681,12 +695,10 @@
   pulling from ssh://user@dummy/server
   searching for changes
   OBSEXC: looking for common markers in 8 nodes
-  OBSEXC: request obsmarkers for 1 common nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg log -G
   o  8 45f8b879de92 foo tip
@@ -716,9 +728,9 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r 'desc("foo")' (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obshashrange cache reset (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 11o) (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (5r, 13o) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obscache cache reset (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 11o) (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 13o) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated stablerange cache in *.???? seconds (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (3r, 0o) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob)
@@ -730,13 +742,12 @@
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G exited 0 after *.?? seconds (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 1/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obsdiscovery, 0/8 mismatch - 1 obshashrange queries in *.???? seconds (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 0o) (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated stablerange cache in *.???? seconds (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> obshashcache reset - new markers affect cached ranges (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 2o) (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated base branch cache in *.???? seconds (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote base branch cache with 1 labels and 2 nodes (glob)
-  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (1r, 2o) (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obshashrange in *.???? seconds (1r, 0o) (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated served branch cache in *.???? seconds (glob)
+  * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> wrote served branch cache with 1 labels and 2 nodes (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> pull exited 0 after *.?? seconds (glob)
   * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> log -G (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-drop.t
--- a/tests/test-drop.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-drop.t	Fri Oct 20 18:34:22 2017 +0200
@@ -1,6 +1,7 @@
 
   $ cat >> $HGRCPATH <<EOF
   > [extensions]
+  > hgext.graphlog=
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
   $ echo "drophack=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/drophack.py" >> $HGRCPATH
@@ -206,13 +207,11 @@
   | x  changeset:   3:87ea30a976fd
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    pruned
   | |  summary:     temporary amend commit for 34b6c051bf1f
   | |
   | x  changeset:   2:34b6c051bf1f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as a2c06c884bfe
   |    summary:     add child
   |
   o  changeset:   1:19509a42b0d0
@@ -264,3 +263,4 @@
      summary:     add base
   
   ============ obsmark ============
+  87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '0', 'user': 'test'} (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-cycles.t
--- a/tests/test-evolve-cycles.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-cycles.t	Fri Oct 20 18:34:22 2017 +0200
@@ -62,19 +62,16 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 2a34000d3544
   |  summary:     C
   |
   x  changeset:   2:c473644ee0e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as a8df460dbbfe
   |  summary:     B
   |
   @  changeset:   1:2a34000d3544
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as c473644ee0e9
   |  summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -207,37 +204,31 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 868d2e0eb19c
   |  summary:     F
   |
   x  changeset:   5:0da815c333f6
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as d9f908fde1a1
   |  summary:     E
   |
   @  changeset:   4:868d2e0eb19c
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as 0da815c333f6
   |  summary:     D
   |
   x  changeset:   3:a8df460dbbfe
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    split as 2a34000d3544, 868d2e0eb19c
   |  summary:     C
   |
   x  changeset:   2:c473644ee0e9
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as a8df460dbbfe
   |  summary:     B
   |
   x  changeset:   1:2a34000d3544
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    rewritten as c473644ee0e9
   |  summary:     A
   |
   o  changeset:   0:ea207398892e
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-effectflags.t
--- a/tests/test-evolve-effectflags.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-effectflags.t	Fri Oct 20 18:34:22 2017 +0200
@@ -40,7 +40,6 @@
   changeset:   1:471f378eab4c
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reworded as fdf9bde5129a
   summary:     A0
   
 
@@ -64,7 +63,6 @@
   changeset:   3:ef4a313b1e0a
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    reauthored as 5485c92d3433
   summary:     B0
   
 
@@ -88,7 +86,6 @@
   changeset:   5:2ef0680ff450
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    date-changed as 4dd84345082e
   summary:     B1
   
 
@@ -116,7 +113,6 @@
   changeset:   7:bd3db8264cee
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    branch-changed as 14a01456e057
   summary:     B2
   
 
@@ -145,7 +141,6 @@
   changeset:   11:c85eff83a034
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased as da86aa2f19a3
   summary:     D0
   
 
@@ -171,7 +166,6 @@
   changeset:   13:ebfe0333e0d9
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    amended as 75781fdbdbf5
   summary:     E0
   
 
@@ -198,7 +192,6 @@
   changeset:   16:fad47e5bd78e
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rewritten as a94e0fd5f1c8
   summary:     F0
   
 
@@ -254,7 +247,6 @@
   branch:      my-other-branch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rebased as e509e2eb3df5
   summary:     H1
   
 amend closing the branch should be detected as meta change
@@ -279,6 +271,5 @@
   branch:      closedbranch
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    meta-changed as 12c6238b5e37
   summary:     I0
   
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-obshistory-complex.t
--- a/tests/test-evolve-obshistory-complex.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-obshistory-complex.t	Fri Oct 20 18:34:22 2017 +0200
@@ -99,25 +99,21 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rewritten as d15d0ffc75f6
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten as d15d0ffc75f6
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as b868bc49b0a4
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as b868bc49b0a4
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -273,25 +269,21 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    split as 7b3290f6e0a0, d0f33db50670
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    split as 7b3290f6e0a0, d0f33db50670
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    split as 19e14c8397fc, e036916b63ea
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 19e14c8397fc, e036916b63ea
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
@@ -338,25 +330,21 @@
   x | |  changeset:   4:868d2e0eb19c
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    split as 7b3290f6e0a0, ec31316faa9d
   | | |  summary:     D
   | | |
   x | |  changeset:   3:a8df460dbbfe
   |/ /   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    split as 7b3290f6e0a0, ec31316faa9d
   | |    summary:     C
   | |
   x |  changeset:   2:c473644ee0e9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
   | |  summary:     B
   | |
   x |  changeset:   1:2a34000d3544
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 19e14c8397fc, 7b3290f6e0a0
   |    summary:     A
   |
   o  changeset:   0:ea207398892e
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-obshistory.t
--- a/tests/test-evolve-obshistory.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-obshistory.t	Fri Oct 20 18:34:22 2017 +0200
@@ -41,13 +41,11 @@
   | x  changeset:   2:f137d23bb3e1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    pruned
   | |  summary:     temporary amend commit for 471f378eab4c
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 4ae3a4151de9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -82,7 +80,7 @@
   $ hg obslog --no-graph --patch 4ae3a4151de9
   4ae3a4151de9 (3) A1
   471f378eab4c (1) A0
-    rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
+    rewritten(description, content) as 4ae3a4151de9 by test (*) (glob)
       --- a/471f378eab4c-changeset-description	
       +++ b/4ae3a4151de9-changeset-description	
       @@ -1,1 +1,3 @@
@@ -102,7 +100,7 @@
   $ hg obslog 4ae3a4151de9 --graph -T'{label("log.summary", shortdescription)} {if(markers, join(markers % "at {date|hgdate} by {user|person} ", " also "))}'
   @  A1
   |
-  x  A0 at 0 0 by test
+  x  A0 at * by test (glob)
   
   $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool
   [
@@ -225,7 +223,6 @@
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
-  |  obsolete:    pruned
   |  summary:     B0
   |
   @  changeset:   1:471f378eab4c
@@ -365,7 +362,6 @@
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 337fec4d2edc, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -619,7 +615,6 @@
   | x  changeset:   1:de7290d8b885
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -795,13 +790,11 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1002,7 +995,6 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1035,8 +1027,6 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
-  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1318,7 +1308,6 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -1346,19 +1335,16 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1582,13 +1568,11 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1629,7 +1613,6 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-serveronly-bundle2.t
--- a/tests/test-evolve-serveronly-bundle2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -108,7 +108,6 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 2 new obsolescence markers
-  remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
   pushing to http://localhost:$HGPORT/
@@ -128,7 +127,6 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-serveronly.t
--- a/tests/test-evolve-serveronly.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-serveronly.t	Fri Oct 20 18:34:22 2017 +0200
@@ -116,7 +116,6 @@
   (please upgrade your server)
   pushing 2 obsolescence markers (* bytes) (glob)
   remote: 2 obsolescence markers added
-  remote: obsoleted 1 changesets
   $ cat ../errors.log
   $ hg push
   pushing to http://localhost:$HGPORT/
@@ -140,7 +139,6 @@
   pulling obsmarker using legacy method
   (please upgrade your server)
   2 obsolescence markers added
-  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 18:34:22 2017 +0200
@@ -47,19 +47,16 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as d004c8f274b9 by test2
   |    summary:     A1
   |
   | x  changeset:   2:f137d23bb3e1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    pruned
   | |  summary:     temporary amend commit for 471f378eab4c
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -79,18 +76,18 @@
   o  d004c8f274b9 (4) A2
   |
   x  a468dc9b3633 (3) A1
-  |    rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
+  |    rewritten(description) as d004c8f274b9 by test2 (*) (glob)
   |
   @  471f378eab4c (1) A0
-       rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
+       rewritten(description, content) as a468dc9b3633 by test (*) (glob)
   
   $ hg tlog
   o  d004c8f274b9
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 4:d004c8f274b9
-  |      semi-colon: 4:d004c8f274b9
+  |/     Successors: [d004c8f274b9]
+  |      semi-colon: [d004c8f274b9]
   |      Fate: rewritten as d004c8f274b9 by test, test2
   |
   o  ea207398892e
@@ -107,7 +104,6 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -137,7 +133,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as d004c8f274b9 by test, test2 (*) (glob)
   |
   o  ea207398892e
   
@@ -168,11 +164,11 @@
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  d004c8f274b9
-  |    Precursors: 3:a468dc9b3633
-  |    semi-colon: 3:a468dc9b3633
+  |    Precursors: a468dc9b3633
+  |    semi-colon: a468dc9b3633
   | @  a468dc9b3633
-  |/     Successors: 4:d004c8f274b9
-  |      semi-colon: 4:d004c8f274b9
+  |/     Successors: [d004c8f274b9]
+  |      semi-colon: [d004c8f274b9]
   |      Fate: reworded as d004c8f274b9 by test2
   |
   o  ea207398892e
@@ -181,25 +177,33 @@
 --hidden  
   $ hg tlog --hidden
   o  d004c8f274b9
-  |    Precursors: 3:a468dc9b3633
-  |    semi-colon: 3:a468dc9b3633
+  |    Precursors: a468dc9b3633
+  |    semi-colon: a468dc9b3633
   | @  a468dc9b3633
-  |/     Precursors: 1:471f378eab4c
-  |      semi-colon: 1:471f378eab4c
-  |      Successors: 4:d004c8f274b9
-  |      semi-colon: 4:d004c8f274b9
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
+  |      Successors: [d004c8f274b9]
+  |      semi-colon: [d004c8f274b9]
   |      Fate: reworded as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned
   | |
   | x  471f378eab4c
-  |/     Successors: 3:a468dc9b3633
-  |      semi-colon: 3:a468dc9b3633
+  |/     Successors: [a468dc9b3633]
+  |      semi-colon: [a468dc9b3633]
   |      Fate: rewritten as a468dc9b3633
   |
   o  ea207398892e
   
+  $ hg fatelog -v
+  o  d004c8f274b9
+  |
+  | @  a468dc9b3633
+  |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
+  |
+  o  ea207398892e
+  
   $ hg up 'desc(A2)'
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg tlog
@@ -209,21 +213,21 @@
   
   $ hg tlog --hidden
   @  d004c8f274b9
-  |    Precursors: 3:a468dc9b3633
-  |    semi-colon: 3:a468dc9b3633
+  |    Precursors: a468dc9b3633
+  |    semi-colon: a468dc9b3633
   | x  a468dc9b3633
-  |/     Precursors: 1:471f378eab4c
-  |      semi-colon: 1:471f378eab4c
-  |      Successors: 4:d004c8f274b9
-  |      semi-colon: 4:d004c8f274b9
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
+  |      Successors: [d004c8f274b9]
+  |      semi-colon: [d004c8f274b9]
   |      Fate: reworded as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned
   | |
   | x  471f378eab4c
-  |/     Successors: 3:a468dc9b3633
-  |      semi-colon: 3:a468dc9b3633
+  |/     Successors: [a468dc9b3633]
+  |      semi-colon: [a468dc9b3633]
   |      Fate: rewritten as a468dc9b3633
   |
   o  ea207398892e
@@ -238,13 +242,13 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded as d004c8f274b9 by test2 (*) (glob)
   |
   | x  f137d23bb3e1
-  | |    Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
+  | |    Obsfate: pruned by test (at *) (glob)
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as a468dc9b3633 by test (*) (glob)
   |
   o  ea207398892e
   
@@ -252,11 +256,11 @@
   $ hg fatelogjson --hidden
   @  d004c8f274b9 []
   |
-  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
+  | x  a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] (glob)
   |/
-  | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
+  | x  f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [*, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [*, 0], "min_date": [*, 0], "successors": [], "users": ["test"], "verb": "pruned"}] (glob)
   | |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] (glob)
   |/
   o  ea207398892e []
   
@@ -335,7 +339,6 @@
   | x  changeset:   1:471597cad322
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    split as 337fec4d2edc, f257fde29c7a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -355,14 +358,14 @@
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  f257fde29c7a
-  |    Precursors: 1:471597cad322
-  |    semi-colon: 1:471597cad322
+  |    Precursors: 471597cad322
+  |    semi-colon: 471597cad322
   o  337fec4d2edc
-  |    Precursors: 1:471597cad322
-  |    semi-colon: 1:471597cad322
+  |    Precursors: 471597cad322
+  |    semi-colon: 471597cad322
   | @  471597cad322
-  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
-  |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
+  |/     Successors: [337fec4d2edc, f257fde29c7a]
+  |      semi-colon: [337fec4d2edc, f257fde29c7a]
   |      Fate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
@@ -394,14 +397,14 @@
 --hidden
   $ hg tlog --hidden
   @  f257fde29c7a
-  |    Precursors: 1:471597cad322
-  |    semi-colon: 1:471597cad322
+  |    Precursors: 471597cad322
+  |    semi-colon: 471597cad322
   o  337fec4d2edc
-  |    Precursors: 1:471597cad322
-  |    semi-colon: 1:471597cad322
+  |    Precursors: 471597cad322
+  |    semi-colon: 471597cad322
   | x  471597cad322
-  |/     Successors: 2:337fec4d2edc 3:f257fde29c7a
-  |      semi-colon: 2:337fec4d2edc 3:f257fde29c7a
+  |/     Successors: [337fec4d2edc, f257fde29c7a]
+  |      semi-colon: [337fec4d2edc, f257fde29c7a]
   |      Fate: split as 337fec4d2edc, f257fde29c7a
   |
   o  ea207398892e
@@ -422,7 +425,7 @@
   |
   o  337fec4d2edc []
   |
-  | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}]
+  | x  471597cad322 [{"markers": [["471597cad322d1f659bb169751be9133dad92ef3", ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], 0, [["ef1", "12"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["337fec4d2edcf0e7a467e35f818234bc620068b5", "f257fde29c7a847c9b607f6e958656d0df0fb15c"], "users": ["test"], "verb": "split"}] (glob)
   |/
   o  ea207398892e []
   
@@ -469,13 +472,11 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -494,11 +495,11 @@
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 3:eb5a0daa2192
-  |      semi-colon: 3:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -520,16 +521,16 @@
 displayed
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 2:0dec01379d3b 1:471f378eab4c
-  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+  |    Precursors: 0dec01379d3b 471f378eab4c
+  |    semi-colon: 0dec01379d3b; 471f378eab4c
   | @  0dec01379d3b
-  | |    Successors: 3:eb5a0daa2192
-  | |    semi-colon: 3:eb5a0daa2192
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
   | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Successors: 3:eb5a0daa2192
-  |      semi-colon: 3:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -560,16 +561,16 @@
 --hidden
   $ hg tlog --hidden
   @  eb5a0daa2192
-  |    Precursors: 2:0dec01379d3b 1:471f378eab4c
-  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+  |    Precursors: 0dec01379d3b 471f378eab4c
+  |    semi-colon: 0dec01379d3b; 471f378eab4c
   | x  0dec01379d3b
-  | |    Successors: 3:eb5a0daa2192
-  | |    semi-colon: 3:eb5a0daa2192
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
   | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Successors: 3:eb5a0daa2192
-  |      semi-colon: 3:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -589,9 +590,9 @@
   $ hg fatelogjson --hidden
   @  eb5a0daa2192 []
   |
-  | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+  | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   | |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   |/
   o  ea207398892e []
   
@@ -618,7 +619,6 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -651,8 +651,6 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
-  |    obsolete:    reworded as 65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -673,14 +671,14 @@
 Precursors template should show current revision as it is the working copy
   $ hg tlog
   o  019fadeab383
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | o  fdf9bde5129a
-  |/     Precursors: 1:471f378eab4c
-  |      semi-colon: 1:471f378eab4c
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
-  |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
+  |/     Successors: [fdf9bde5129a], [019fadeab383]
+  |      semi-colon: [fdf9bde5129a]; [019fadeab383]
   |      Fate: reworded as fdf9bde5129a
   |      Fate: reworded as 019fadeab383
   |
@@ -719,21 +717,21 @@
 Precursors template should a precursor as we force its display with --hidden
   $ hg tlog --hidden
   o  019fadeab383
-  |    Precursors: 3:65b757b745b9
-  |    semi-colon: 3:65b757b745b9
+  |    Precursors: 65b757b745b9
+  |    semi-colon: 65b757b745b9
   | x  65b757b745b9
-  |/     Precursors: 1:471f378eab4c
-  |      semi-colon: 1:471f378eab4c
-  |      Successors: 4:019fadeab383
-  |      semi-colon: 4:019fadeab383
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
+  |      Successors: [019fadeab383]
+  |      semi-colon: [019fadeab383]
   |      Fate: reworded as 019fadeab383
   |
   | @  fdf9bde5129a
-  |/     Precursors: 1:471f378eab4c
-  |      semi-colon: 1:471f378eab4c
+  |/     Precursors: 471f378eab4c
+  |      semi-colon: 471f378eab4c
   | x  471f378eab4c
-  |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
-  |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
+  |/     Successors: [fdf9bde5129a], [65b757b745b9]
+  |      semi-colon: [fdf9bde5129a]; [65b757b745b9]
   |      Fate: reworded as fdf9bde5129a
   |      Fate: reworded as 65b757b745b9
   |
@@ -756,11 +754,11 @@
   $ hg fatelogjson --hidden
   o  019fadeab383 []
   |
-  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}]
+  | x  65b757b745b9 [{"markers": [["65b757b745b935093c87a2bccd877521cccffcbd", ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["019fadeab383f6699fa83ad7bdb4d82ed2c0e5ab"], "users": ["test"], "verb": "reworded"}] (glob)
   |/
   | @  fdf9bde5129a []
   |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], "users": ["test"], "verb": "reworded"}, {"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["65b757b745b935093c87a2bccd877521cccffcbd"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["65b757b745b935093c87a2bccd877521cccffcbd"], "users": ["test"], "verb": "reworded"}] (glob)
   |/
   o  ea207398892e []
   
@@ -788,7 +786,6 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -816,19 +813,16 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    rewritten as eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded as b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -845,11 +839,11 @@
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 4:eb5a0daa2192
-  |      semi-colon: 4:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -868,16 +862,16 @@
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 2:0dec01379d3b 1:471f378eab4c
-  |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
+  |    Precursors: 0dec01379d3b 471f378eab4c
+  |    semi-colon: 0dec01379d3b; 471f378eab4c
   | @  0dec01379d3b
-  | |    Successors: 4:eb5a0daa2192
-  | |    semi-colon: 4:eb5a0daa2192
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
   | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Successors: 4:eb5a0daa2192
-  |      semi-colon: 4:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -900,16 +894,16 @@
   (use 'hg evolve' to update to its successor: eb5a0daa2192)
   $ hg tlog
   o  eb5a0daa2192
-  |    Precursors: 1:471f378eab4c 3:b7ea6d14e664
-  |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+  |    Precursors: 471f378eab4c b7ea6d14e664
+  |    semi-colon: 471f378eab4c; b7ea6d14e664
   | @  b7ea6d14e664
-  | |    Successors: 4:eb5a0daa2192
-  | |    semi-colon: 4:eb5a0daa2192
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
   | |    Fate: rewritten as eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Successors: 4:eb5a0daa2192
-  |      semi-colon: 4:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -935,23 +929,23 @@
   
   $ hg tlog --hidden
   @  eb5a0daa2192
-  |    Precursors: 1:471f378eab4c 3:b7ea6d14e664
-  |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
+  |    Precursors: 471f378eab4c b7ea6d14e664
+  |    semi-colon: 471f378eab4c; b7ea6d14e664
   | x  b7ea6d14e664
-  | |    Precursors: 2:0dec01379d3b
-  | |    semi-colon: 2:0dec01379d3b
-  | |    Successors: 4:eb5a0daa2192
-  | |    semi-colon: 4:eb5a0daa2192
+  | |    Precursors: 0dec01379d3b
+  | |    semi-colon: 0dec01379d3b
+  | |    Successors: [eb5a0daa2192]
+  | |    semi-colon: [eb5a0daa2192]
   | |    Fate: rewritten as eb5a0daa2192
   | |
   | | x  0dec01379d3b
-  | |/     Successors: 3:b7ea6d14e664
-  | |      semi-colon: 3:b7ea6d14e664
+  | |/     Successors: [b7ea6d14e664]
+  | |      semi-colon: [b7ea6d14e664]
   | |      Fate: reworded as b7ea6d14e664
   | |
   | x  471f378eab4c
-  |/     Successors: 4:eb5a0daa2192
-  |      semi-colon: 4:eb5a0daa2192
+  |/     Successors: [eb5a0daa2192]
+  |      semi-colon: [eb5a0daa2192]
   |      Fate: rewritten as eb5a0daa2192
   |
   o  ea207398892e
@@ -973,11 +967,11 @@
   $ hg fatelogjson --hidden
   @  eb5a0daa2192 []
   |
-  | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+  | x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   | |
-  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
+  | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}] (glob)
   | |/
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [*, 0], null]], "max_date": [*, 0], "min_date": [*, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}] (glob)
   |/
   o  ea207398892e []
   
@@ -1023,13 +1017,11 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1046,7 +1038,6 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -1061,7 +1052,6 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1074,11 +1064,11 @@
 
   $ hg tlog
   o  7a230b46bf61
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | @  471f378eab4c
-  |/     Successors: 2:7a230b46bf61
-  |      semi-colon: 2:7a230b46bf61
+  |/     Successors: [7a230b46bf61]
+  |      semi-colon: [7a230b46bf61]
   |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
@@ -1087,7 +1077,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
   |
   o  ea207398892e
   
@@ -1105,11 +1095,11 @@
   
   $ hg tlog --hidden
   @  7a230b46bf61
-  |    Precursors: 1:471f378eab4c
-  |    semi-colon: 1:471f378eab4c
+  |    Precursors: 471f378eab4c
+  |    semi-colon: 471f378eab4c
   | x  471f378eab4c
-  |/     Successors: 2:7a230b46bf61
-  |      semi-colon: 2:7a230b46bf61
+  |/     Successors: [7a230b46bf61]
+  |      semi-colon: [7a230b46bf61]
   |      Fate: reworded as 7a230b46bf61
   |
   o  ea207398892e
@@ -1118,7 +1108,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded as 7a230b46bf61 by test (*) (glob)
   |
   o  ea207398892e
   
@@ -1126,7 +1116,7 @@
   $ hg fatelogjson --hidden
   @  7a230b46bf61 []
   |
-  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}]
+  | x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null], ["fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], 0, [["ef1", "1"], ["user", "test"]], [*, *], null]], "max_date": [*, *], "min_date": [*, *], "successors": ["7a230b46bf61e50b30308c6cfd7bd1269ef54702"], "users": ["test"], "verb": "reworded"}] (glob)
   |/
   o  ea207398892e []
   
@@ -1161,7 +1151,7 @@
   
   $ hg fatelog -v
   @  471f378eab4c
-  |    Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
+  |    Obsfate: pruned by test (at *) (glob)
   |
   o  ea207398892e
   
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A1.t
--- a/tests/test-exchange-obsmarkers-case-A1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -61,7 +61,7 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -88,7 +88,7 @@
   # testing echange of "A" (f5bc6836db60)
   ## initial state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "A" from main to pushdest
@@ -101,9 +101,9 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "f5bc6836db60" from main into pulldest
   pulling from main
@@ -116,11 +116,11 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
 
 Variant b: push
 ---------------
@@ -129,7 +129,7 @@
   ## Running testcase A.1.1.b
   ## initial state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing from main to pushdest
@@ -142,9 +142,9 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling from main into pulldest
   pulling from main
@@ -157,11 +157,11 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
 
 A.1.2 pushing multiple changesets into a single head
 ====================================================
@@ -212,7 +212,7 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -242,7 +242,7 @@
   # testing echange of "B" (f6fbb35d8ac9)
   ## initial state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "B" from main to pushdest
@@ -255,9 +255,9 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "f6fbb35d8ac9" from main into pulldest
   pulling from main
@@ -270,11 +270,11 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
 
 Variant b: push
 ---------------
@@ -283,7 +283,7 @@
   ## Running testcase A.1.2.b
   ## initial state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing from main to pushdest
@@ -296,9 +296,9 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling from main into pulldest
   pulling from main
@@ -311,8 +311,8 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A2.t
--- a/tests/test-exchange-obsmarkers-case-A2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -71,8 +71,8 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -97,8 +97,8 @@
   # testing echange of "A" (f5bc6836db60)
   ## initial state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "A" from main to pushdest
@@ -111,10 +111,10 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "f5bc6836db60" from main into pulldest
   pulling from main
@@ -127,11 +127,11 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
+  bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 35b1839966785d5703a01607229eea932db42f87 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (*) {'user': 'test'} (glob)
 
   $ cd ..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A3.t
--- a/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -73,9 +73,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6298a8ac3a4 (draft): B1
   |
@@ -90,8 +88,8 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -118,8 +116,8 @@
   # testing echange of "A1" (e5ea8f9c7314)
   ## initial state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "A1" from main to pushdest
@@ -132,10 +130,10 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "e5ea8f9c7314" from main into pulldest
   pulling from main
@@ -148,12 +146,12 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
 
 other variant: changeset known in remote
 ----------------------------------------
@@ -176,9 +174,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6298a8ac3a4 (draft): B1
   |
@@ -193,8 +189,8 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -234,8 +230,8 @@
   # testing echange of "A1" (e5ea8f9c7314)
   ## initial state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "A1" from main to pushdest
@@ -246,13 +242,12 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 1 new obsolescence markers
-  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "e5ea8f9c7314" from main into pulldest
   pulling from main
@@ -262,14 +257,13 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
   ## post pull state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A4.t
--- a/tests/test-exchange-obsmarkers-case-A4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -64,7 +64,6 @@
   created new head
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
@@ -77,8 +76,8 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -106,8 +105,8 @@
   # testing echange of "B" (06055a7959d4)
   ## initial state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "B" from main to pushdest
@@ -120,10 +119,10 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "06055a7959d4" from main into pulldest
   pulling from main
@@ -136,9 +135,9 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A5.t
--- a/tests/test-exchange-obsmarkers-case-A5.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t	Fri Oct 20 18:34:22 2017 +0200
@@ -66,9 +66,7 @@
   $ mkcommit A1
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  8c0a98c83722 (draft): A1
   |
@@ -83,9 +81,9 @@
   $ inspect_obsmarkers
   obsstore content
   ================
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
   obshashtree
   ===========
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
@@ -112,9 +110,9 @@
   # testing echange of "B1" (f6298a8ac3a4)
   ## initial state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
   # obstore: pulldest
   ## pushing "B1" from main to pushdest
@@ -127,11 +125,11 @@
   remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
   ## pulling "f6298a8ac3a4" from main into pulldest
   pulling from main
@@ -144,10 +142,10 @@
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
-  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
-  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (*) {'user': 'test'} (glob)
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
+  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (*) {'user': 'test'} (glob)
   # obstore: pushdest
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
   # obstore: pulldest
-  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+  6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (*) {'user': 'test'} (glob)
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-A6.t
--- a/tests/test-exchange-obsmarkers-case-A6.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-A6.t	Fri Oct 20 18:34:22 2017 +0200
@@ -64,7 +64,6 @@
 create a marker after this
 
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
@@ -109,7 +108,6 @@
   searching for changes
   no changes found
   remote: 1 new obsolescence markers
-  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -120,7 +118,6 @@
   pulling from main
   no changes found
   1 new obsolescence markers
-  obsoleted 1 changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -144,7 +141,6 @@
   searching for changes
   no changes found
   remote: 1 new obsolescence markers
-  remote: obsoleted 1 changesets
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -156,7 +152,6 @@
   searching for changes
   no changes found
   1 new obsolescence markers
-  obsoleted 1 changesets
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-B5.t
--- a/tests/test-exchange-obsmarkers-case-B5.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Fri Oct 20 18:34:22 2017 +0200
@@ -70,10 +70,8 @@
   created new head
   $ mkcommit B1
   $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
   $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
-  obsoleted 1 changesets
   $ hg prune -qd '0 0' 'desc(B1)' 
   $ hg log -G --hidden
   x  069b05c3876d (draft): B1
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-B6.t
--- a/tests/test-exchange-obsmarkers-case-B6.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-B6.t	Fri Oct 20 18:34:22 2017 +0200
@@ -57,7 +57,6 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
-  obsoleted 1 changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  f6298a8ac3a4 (draft): B1
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-C2.t
--- a/tests/test-exchange-obsmarkers-case-C2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -62,7 +62,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  e5ea8f9c7314 (draft): A1
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-C3.t
--- a/tests/test-exchange-obsmarkers-case-C3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -64,7 +64,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
   x  e5ea8f9c7314 (draft): A1
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-C4.t
--- a/tests/test-exchange-obsmarkers-case-C4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -65,7 +65,6 @@
   $ mkcommit C
   created new head
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
-  obsoleted 1 changesets
   $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
   $ hg prune -qd '0 0' .
   $ hg log -G --hidden
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-D1.t
--- a/tests/test-exchange-obsmarkers-case-D1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -61,7 +61,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg prune -d '0 0' 'desc(B)'
   1 changesets pruned
   $ hg strip --hidden -q 'desc(A0)' --config devel.strip-obsmarkers=no
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-D2.t
--- a/tests/test-exchange-obsmarkers-case-D2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -54,7 +54,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg prune --date '0 0' .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at a9bdc8b26820
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-D3.t
--- a/tests/test-exchange-obsmarkers-case-D3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -57,7 +57,6 @@
   created new head
   $ mkcommit A1
   $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
-  obsoleted 1 changesets
   $ hg prune -d '0 0' .
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at 35b183996678
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-exchange-obsmarkers-case-D4.t
--- a/tests/test-exchange-obsmarkers-case-D4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,10 +59,8 @@
   created new head
   $ mkcommit B1
   $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-  obsoleted 1 changesets
   $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
   $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-  obsoleted 1 changesets
   $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(B1)'`
   $ hg log -G --hidden
   @  069b05c3876d (draft): B1
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-inhibit.t
--- a/tests/test-inhibit.t	Fri Oct 20 18:25:05 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,933 +0,0 @@
-  $ cat >> $HGRCPATH <<EOF
-  > [ui]
-  > logtemplate = {rev}:{node|short} {desc}\n
-  > [experimental]
-  > prunestrip=True
-  > evolution=createmarkers
-  > [extensions]
-  > rebase=
-  > strip=
-  > EOF
-  $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
-  $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH
-  $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH
-  $ mkcommit() {
-  >    echo "$1" > "$1"
-  >    hg add "$1"
-  >    hg ci -m "add $1"
-  > }
-
-  $ hg init inhibit
-  $ cd inhibit
-  $ mkcommit cA
-  $ mkcommit cB
-  $ mkcommit cC
-  $ mkcommit cD
-  $ hg up 'desc(cA)'
-  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ mkcommit cE
-  created new head
-  $ mkcommit cG
-  $ mkcommit cH
-  $ mkcommit cJ
-  $ hg log -G
-  @  7:18214586bf78 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | o  3:2db36d8066ff add cD
-  | |
-  | o  2:7df62a38b9bf add cC
-  | |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-plain prune
-
-  $ hg strip 1::
-  3 changesets pruned
-  $ hg log -G
-  @  7:18214586bf78 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg debugobsinhibit --hidden 1::
-  $ hg log -G
-  @  7:18214586bf78 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | o  3:2db36d8066ff add cD
-  | |
-  | o  2:7df62a38b9bf add cC
-  | |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg strip --hidden 1::
-  3 changesets pruned
-  $ hg log -G
-  @  7:18214586bf78 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-
-after amend
-
-  $ echo babar > cJ
-  $ hg commit --amend
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg debugobsinhibit --hidden 18214586bf78
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-
-and no divergence
-
-  $ hg summary
-  parent: 9:55c73a90e4b4 tip
-   add cJ
-  branch: default
-  commit: (clean)
-  update: 1 new changesets, 2 branch heads (merge)
-  phases: 6 draft
-
-check public revision got cleared
-(when adding the second inhibitor, the first one is removed because it is public)
-
-  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
-  20 .hg/store/obsinhibit
-  $ hg strip 7
-  1 changesets pruned
-  $ hg debugobsinhibit --hidden 18214586bf78
-  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
-  20 .hg/store/obsinhibit
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg phase --public 7
-  1 new bumped changesets
-  $ hg strip 9
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory now at cf5c4f4554ce
-  1 changesets pruned
-  $ hg log -G
-  o  7:18214586bf78 add cJ
-  |
-  @  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg debugobsinhibit --hidden 55c73a90e4b4
-  $ wc -m .hg/store/obsinhibit | sed -e 's/^[ \t]*//'
-  20 .hg/store/obsinhibit
-  $ hg log -G
-  o  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  @  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-Update should inhibit all related unstable commits
-
-  $ hg update 2 --hidden
-  2 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg log -G
-  o  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | @  2:7df62a38b9bf add cC
-  | |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-  $ hg update 9
-  4 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | o  2:7df62a38b9bf add cC
-  | |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg strip --hidden 1::
-  3 changesets pruned
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-
-Bookmark should inhibit all related unstable commits
-  $ hg bookmark -r 2 book1  --hidden
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | o  2:7df62a38b9bf add cC
-  | |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-Removing a bookmark with bookmark -D should prune the changes underneath
-that are not reachable from another bookmark or head
-
-  $ hg bookmark -r 1 book2
-  $ hg bookmark -D book1  --config experimental.evolution=createmarkers #--config to make sure prune is not registered as a command.
-  bookmark 'book1' deleted
-  1 changesets pruned
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  | o  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg bookmark -D book2
-  bookmark 'book2' deleted
-  1 changesets pruned
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-Test edge cases of bookmark -D
-  $ hg book -D book2 -m hello
-  abort: Cannot use both -m and -D
-  [255]
-
-  $ hg book -Draster-fix
-  abort: Error, please check your command
-  (make sure to put a space between -D and your bookmark name)
-  [255]
-
-Test that direct access make changesets visible
-
-  $ hg export 2db36d8066ff 02bcbc3f6e56
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
-  # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
-  add cD
-  
-  diff -r 7df62a38b9bf -r 2db36d8066ff cD
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +cD
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 02bcbc3f6e56fb2928efec2c6e24472720bf5511
-  # Parent  54ccbc537fc2d6845a5d61337c1cfb80d1d2815e
-  add cB
-  
-  diff -r 54ccbc537fc2 -r 02bcbc3f6e56 cB
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/cB	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +cB
-
-But only with hash
-
-  $ hg export 2db36d8066ff::
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 2db36d8066ff50e8be3d3e6c2da1ebc0a8381d82
-  # Parent  7df62a38b9bf9daf968de235043ba88a8ef43393
-  add cD
-  
-  diff -r 7df62a38b9bf -r 2db36d8066ff cD
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/cD	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +cD
-
-  $ hg export 1 3
-  abort: hidden revision '1'!
-  (use --hidden to access hidden revisions; pruned)
-  [255]
-
-
-Test directaccess in a larger revset
-
-  $ hg log -r '. + .^ + 2db36d8066ff' -T '{node|short}\n'
-  55c73a90e4b4
-  cf5c4f4554ce
-  2db36d8066ff
-
-Test directaccess only takes hashes
-
-  $ HOOKPATH=$TESTTMP/printexplicitaccess.py
-  $ cat >> $HOOKPATH <<EOF
-  > def hook(ui, repo, **kwds):
-  >     for i in sorted(repo._explicitaccess):
-  >         ui.write('directaccess: %s\n' % i)
-  > EOF
-
-  $ hg log -r 1 -r 2 -r 2db36d8066f -T '{rev}\n' --config hooks.post-log=python:$HOOKPATH:hook
-  1
-  2
-  3
-  directaccess: 3
-
-With severals hidden sha, rebase of one hidden stack onto another one:
-  $ hg update -C 0
-  0 files updated, 0 files merged, 4 files removed, 0 files unresolved
-  $ mkcommit cK
-  created new head
-  $ mkcommit cL
-  $ hg update -C 9
-  4 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg log -G
-  o  11:53a94305e133 add cL
-  |
-  o  10:ad78ff7d621f add cK
-  |
-  | @  9:55c73a90e4b4 add cJ
-  | |
-  | | o  7:18214586bf78 add cJ
-  | |/
-  | o  6:cf5c4f4554ce add cH
-  | |
-  | o  5:5419eb264a33 add cG
-  | |
-  | o  4:98065434e5c6 add cE
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg strip --hidden 10:
-  2 changesets pruned
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg rebase -s 10 -d 3 
-  abort: hidden revision '3'!
-  (use --hidden to access hidden revisions; pruned)
-  [255]
-  $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d  2db36d8066ff --config experimental.rebaseskipobsolete=0
-  Warning: accessing hidden changesets 2db36d8066ff for write operation
-  Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
-  rebasing 10:ad78ff7d621f "add cK"
-  rebasing 11:53a94305e133 "add cL"
-  $ hg log -G
-  o  13:2f7b7704d714 add cL
-  |
-  o  12:fe1634cbe235 add cK
-  |
-  | @  9:55c73a90e4b4 add cJ
-  | |
-  | | o  7:18214586bf78 add cJ
-  | |/
-  | o  6:cf5c4f4554ce add cH
-  | |
-  | o  5:5419eb264a33 add cG
-  | |
-  | o  4:98065434e5c6 add cE
-  | |
-  o |  3:2db36d8066ff add cD
-  | |
-  o |  2:7df62a38b9bf add cC
-  | |
-  o |  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-Check that amending in the middle of a stack does not show obsolete revs
-Since we are doing operation in the middle of the stack we cannot just
-have createmarkers as we are creating instability
-
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution=all
-  > EOF
-
-  $ hg strip --hidden 1::
-  5 changesets pruned
-  $ hg log -G
-  @  9:55c73a90e4b4 add cJ
-  |
-  | o  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg up 7
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ mkcommit cL
-  $ mkcommit cM
-  $ mkcommit cN
-  $ hg log -G
-  @  16:a438c045eb37 add cN
-  |
-  o  15:2d66e189f5b5 add cM
-  |
-  o  14:d66ccb8c5871 add cL
-  |
-  | o  9:55c73a90e4b4 add cJ
-  | |
-  o |  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg up 15
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ echo "mmm" >> cM
-  $ hg amend
-  $ hg log -G
-  @  18:210589181b14 add cM
-  |
-  | o  16:a438c045eb37 add cN
-  | |
-  | o  15:2d66e189f5b5 add cM
-  |/
-  o  14:d66ccb8c5871 add cL
-  |
-  | o  9:55c73a90e4b4 add cJ
-  | |
-  o |  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-Check that rebasing a commit twice makes the commit visible again
-
-  $ hg rebase -d 18 -r 16 --keep
-  rebasing 16:a438c045eb37 "add cN"
-  $ hg log -r 14:: -G
-  o  19:104eed5354c7 add cN
-  |
-  @  18:210589181b14 add cM
-  |
-  | o  16:a438c045eb37 add cN
-  | |
-  | o  15:2d66e189f5b5 add cM
-  |/
-  o  14:d66ccb8c5871 add cL
-  |
-  ~
-  $ hg strip -r 210589181b14
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory now at d66ccb8c5871
-  2 changesets pruned
-
-Using a hash prefix solely made of digits should work
-  $ hg update 210589181
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg rebase -d 18 -r 16 --keep
-  rebasing 16:a438c045eb37 "add cN"
-  $ hg log -r 14:: -G
-  o  19:104eed5354c7 add cN
-  |
-  @  18:210589181b14 add cM
-  |
-  | o  16:a438c045eb37 add cN
-  | |
-  | o  15:2d66e189f5b5 add cM
-  |/
-  o  14:d66ccb8c5871 add cL
-  |
-  ~
-
-Test prunestrip
-
-  $ hg book foo -r 104eed5354c7
-  $ hg strip -r 210589181b14
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  working directory now at d66ccb8c5871
-  2 changesets pruned
-  $ hg log -r 14:: -G -T '{rev}:{node|short} {desc|firstline} {bookmarks}\n'
-  o  16:a438c045eb37 add cN
-  |
-  o  15:2d66e189f5b5 add cM
-  |
-  @  14:d66ccb8c5871 add cL foo
-  |
-  ~
-
-Check that --hidden used with inhibit does not hide every obsolete commit
-We show the log before and after a log -G --hidden, they should be the same
-  $ hg log -G
-  o  16:a438c045eb37 add cN
-  |
-  o  15:2d66e189f5b5 add cM
-  |
-  @  14:d66ccb8c5871 add cL
-  |
-  | o  9:55c73a90e4b4 add cJ
-  | |
-  o |  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ hg log -G --hidden
-  x  19:104eed5354c7 add cN
-  |
-  x  18:210589181b14 add cM
-  |
-  | x  17:b3c3274523f9 temporary amend commit for 2d66e189f5b5
-  | |
-  | | o  16:a438c045eb37 add cN
-  | |/
-  | o  15:2d66e189f5b5 add cM
-  |/
-  @  14:d66ccb8c5871 add cL
-  |
-  | x  13:2f7b7704d714 add cL
-  | |
-  | x  12:fe1634cbe235 add cK
-  | |
-  | | x  11:53a94305e133 add cL
-  | | |
-  | | x  10:ad78ff7d621f add cK
-  | | |
-  | | | o  9:55c73a90e4b4 add cJ
-  | | | |
-  +-------x  8:e84f73d9ad36 temporary amend commit for 18214586bf78
-  | | | |
-  o-----+  7:18214586bf78 add cJ
-   / / /
-  | | o  6:cf5c4f4554ce add cH
-  | | |
-  | | o  5:5419eb264a33 add cG
-  | | |
-  | | o  4:98065434e5c6 add cE
-  | |/
-  x |  3:2db36d8066ff add cD
-  | |
-  x |  2:7df62a38b9bf add cC
-  | |
-  x |  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-  $ hg log -G
-  o  16:a438c045eb37 add cN
-  |
-  o  15:2d66e189f5b5 add cM
-  |
-  @  14:d66ccb8c5871 add cL
-  |
-  | o  9:55c73a90e4b4 add cJ
-  | |
-  o |  7:18214586bf78 add cJ
-  |/
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
- 
-check that pruning and inhibited node does not confuse anything
-
-  $ hg up --hidden 210589181b14
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg strip --bundle 210589181b14
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/inhibit/.hg/strip-backup/210589181b14-e09c7b88-backup.hg (glob)
-  $ hg unbundle .hg/strip-backup/210589181b14-e09c7b88-backup.hg # restore state
-  adding changesets
-  adding manifests
-  adding file changes
-  added 2 changesets with 1 changes to 2 files (+1 heads)
-  3 new obsolescence markers
-  obsoleted 1 changesets
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
-
- Only allow direct access and check that evolve works like before
-(also disable evolve commands to avoid hint about using evolve)
-  $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > inhibit=!
-  > [experimental]
-  > evolution=createmarkers
-  > EOF
-
-  $ hg up 15
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete! (2d66e189f5b5)
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution=all
-  > EOF
-  $ echo "CM" > cM
-  $ hg amend
-  $ hg log -G
-  @  21:721c3c279519 add cM
-  |
-  | o  16:a438c045eb37 add cN
-  | |
-  | x  15:2d66e189f5b5 add cM
-  |/
-  o  14:d66ccb8c5871 add cL
-  |
-  o  7:18214586bf78 add cJ
-  |
-  o  6:cf5c4f4554ce add cH
-  |
-  o  5:5419eb264a33 add cG
-  |
-  o  4:98065434e5c6 add cE
-  |
-  o  0:54ccbc537fc2 add cA
-  
-  $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > EOF
-  $ echo "inhibit=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/inhibit.py" >> $HGRCPATH
-
-Empty commit
-  $ hg amend
-  nothing changed
-  [1]
-
-Check that the behavior of rebase with obsolescence markers is maintained
-despite inhibit
-
-  $ hg up a438c045eb37
-  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg rebase -r 15:: -d 21 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 15:2d66e189f5b5 "add cM", already in destination as 21:721c3c279519 "add cM"
-  rebasing 16:a438c045eb37 "add cN"
-  $ hg up -q 2d66e189f5b5 # To inhibit it as the rest of test depends on it
-  $ hg up -q 21
-
-Directaccess should load after some extensions precised in the conf
-With no extension specified:
-
-  $ cat >$TESTTMP/test_extension.py  << EOF
-  > from mercurial import extensions
-  > def uisetup(ui):
-  >   print extensions._order
-  > EOF
-  $ cat >> $HGRCPATH << EOF
-  > [extensions]
-  > testextension=$TESTTMP/test_extension.py
-  > EOF
-  $ hg id
-  ['rebase', 'strip', 'evolve', 'directaccess', 'inhibit', 'testextension']
-  721c3c279519
-
-With test_extension specified:
-  $ cat >> $HGRCPATH << EOF
-  > [directaccess]
-  > loadsafter=testextension
-  > EOF
-  $ hg id
-  ['rebase', 'strip', 'evolve', 'inhibit', 'testextension', 'directaccess']
-  721c3c279519
-
-Inhibit should not work without directaccess
-  $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > directaccess=!
-  > testextension=!
-  > EOF
-  $ hg up .
-  cannot use inhibit without the direct access extension
-  (please enable it or inhibit won't work)
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ echo "directaccess=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/hack/directaccess.py" >> $HGRCPATH
-  $ cd ..
-
-hg push should not allow directaccess unless forced with --hidden
-We copy the inhibhit repo to inhibit2 and make some changes to push to inhibit
-
-  $ cp -r inhibit inhibit2
-  $ pwd=$(pwd)
-  $ cd inhibit
-  $ mkcommit pk
-  created new head
-  $ hg id
-  003a4735afde tip
-  $ echo "OO" > pk
-  $ hg amend
-  $ hg id
-  71eb4f100663 tip
-
-Hidden commits cannot be pushed without --hidden
-  $ hg push -r 003a4735afde $pwd/inhibit2
-  pushing to $TESTTMP/inhibit2
-  abort: hidden revision '003a4735afde'!
-  (use --hidden to access hidden revisions; successor: 71eb4f100663)
-  [255]
-
-Visible commits can still be pushed
-  $ hg push -fr 71eb4f100663 $pwd/inhibit2
-  pushing to $TESTTMP/inhibit2
-  searching for changes
-  adding changesets
-  adding manifests
-  adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  2 new obsolescence markers
-
-Create a stack (obsolete with successor in dest) -> (not obsolete) and rebase
-it. We expect to not see the stack at the end of the rebase.
-  $ hg log -G  -r "25::"
-  @  25:71eb4f100663 add pk
-  |
-  ~
-  $ hg up -C 22
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit Dk
-  $ hg prune 22 -s 25
-  1 changesets pruned
-  $ hg rebase -s 22 -d 25 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 22:46cb6daad392 "add cN", already in destination as 25:71eb4f100663 "add pk"
-  rebasing 26:7ad60e760c7b "add Dk" (tip)
-  $ hg log -G  -r "25::"
-  @  27:1192fa9fbc68 add Dk
-  |
-  o  25:71eb4f100663 add pk
-  |
-  ~
-
-Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete).
-Rebase the first two revs of the stack onto dest, we expect to see one new
-revision on the destination and everything visible.
-  $ hg up 25
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ mkcommit Dl
-  created new head
-  $ mkcommit Dp
-  $ mkcommit Do
-  $ hg log -G -r "25::"
-  @  30:b517facce1ef add Do
-  |
-  o  29:c5a47ab27c2e add Dp
-  |
-  o  28:8c1c2edbaf1b add Dl
-  |
-  | o  27:1192fa9fbc68 add Dk
-  |/
-  o  25:71eb4f100663 add pk
-  |
-  ~
-  $ hg prune 28 -s 27
-  1 changesets pruned
-  $ hg up 25
-  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
-  rebasing 29:c5a47ab27c2e "add Dp"
-  $ hg log -G  -r "25::"
-  o  31:7d8affb1f604 add Dp
-  |
-  | o  30:b517facce1ef add Do
-  | |
-  | o  29:c5a47ab27c2e add Dp
-  | |
-  | o  28:8c1c2edbaf1b add Dl
-  | |
-  o |  27:1192fa9fbc68 add Dk
-  |/
-  @  25:71eb4f100663 add pk
-  |
-  ~
-
-Rebase the same stack in full on the destination, we expect it to disappear
-and only see the top revision added to destination. We don\'t expect 29 to be
-skipped as we used --keep before.
-  $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True
-  note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
-  rebasing 29:c5a47ab27c2e "add Dp"
-  rebasing 30:b517facce1ef "add Do"
-  $ hg log -G  -r "25::"
-  o  32:1d43fff9e26f add Do
-  |
-  o  31:7d8affb1f604 add Dp
-  |
-  o  27:1192fa9fbc68 add Dk
-  |
-  @  25:71eb4f100663 add pk
-  |
-  ~
-
-Pulling from a inhibit repo to a non-inhibit repo should work
-
-  $ cd ..
-  $ hg clone -q inhibit not-inhibit
-  $ cat >> not-inhibit/.hg/hgrc <<EOF
-  > [extensions]
-  > inhibit=!
-  > directaccess=!
-  > evolve=!
-  > EOF
-  $ cd not-inhibit
-  $ hg book -d foo
-  $ hg pull
-  pulling from $TESTTMP/inhibit (glob)
-  searching for changes
-  no changes found
-  adding remote bookmark foo
-
-Test that bookmark -D can take multiple branch names
-  $ cd ../inhibit
-  $ hg bookmark book2 book1 book3
-  $ touch foo && hg add foo && hg ci -m "add foo"
-  created new head
-  $ hg up book1
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  (activating bookmark book1)
-  $ hg bookmark -D book2 book3
-  bookmark 'book2' deleted
-  bookmark 'book3' deleted
-  1 changesets pruned
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-obsolete.t	Fri Oct 20 18:34:22 2017 +0200
@@ -33,7 +33,6 @@
   $ getid 3
   0d3f46688ccc6e756c7e96cf64c391c411309597
   $ hg debugobsolete 4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597
-  obsoleted 1 changesets
   $ hg debugobsolete
   4538525df7e2b9f09423636c61ef63a4cb872a2d 0d3f46688ccc6e756c7e96cf64c391c411309597 0 (*) {'user': 'test'} (glob)
 
@@ -97,7 +96,6 @@
   $ mkcommit "obsol_c'" # 4 (on 1)
   created new head
   $ hg debugobsolete `getid 3` `getid 4`
-  obsoleted 1 changesets
   $ qlog
   4
   - 725c380fe99b
@@ -128,7 +126,6 @@
   parent:      1:7c3bad9141dc
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  obsolete:    rewritten as 725c380fe99b
   summary:     add obsol_c
   
   working directory parent is obsolete! (0d3f46688ccc)
@@ -212,7 +209,6 @@
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 5` `getid 6`
-  obsoleted 1 changesets
   $ qlog
   6
   - 95de7fc6918d
@@ -241,7 +237,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -271,7 +266,6 @@
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 6` `getid 7`
-  obsoleted 1 changesets
   $ hg pull -R ../other-new .
   pulling from .
   searching for changes
@@ -280,7 +274,6 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -361,7 +354,6 @@
   created new head
   1 new unstable changesets
   $ hg debugobsolete `getid 7` `getid 8`
-  obsoleted 1 changesets
   $ cd ../other-new
   $ hg up -q 3
   $ hg pull ../local/
@@ -372,7 +364,6 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
@@ -446,7 +437,6 @@
   - 1f0dee641bb7
 
   $ hg debugobsolete `getid 9` #kill
-  obsoleted 1 changesets
   $ hg up null -q # to be not based on 9 anymore
   $ qlog
   8
@@ -465,7 +455,6 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up 
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to "159dfc9fa5d3: add obsol_d''"
   1 other heads for branch "default"
   $ hg id -n
   8
@@ -550,12 +539,10 @@
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
   3 new obsolescence markers
-  obsoleted 1 changesets
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
   $ hg debugobsolete `getid 11` `getid 12`
-  obsoleted 1 changesets
   $ hg push ../other-new --traceback
   pushing to ../other-new
   searching for changes
@@ -564,7 +551,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
   $ cd ..
 
 check bumped detection
@@ -753,14 +739,12 @@
   | | | x  changeset:   14:33d458d86621
   | | | |  user:        test
   | | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | | |  obsolete:    pruned
   | | | |  summary:     temporary amend commit for 0b1b6dd009c0
   | | | |
   | | | x  changeset:   13:0b1b6dd009c0
   | | |/   parent:      10:2033b4e49474
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    amended as 705ab2a6b72e
   | | |    summary:     add f
   | | |
   | | | o  changeset:   12:6db5e282cb91
@@ -785,36 +769,30 @@
   | |    parent:      -1:000000000000
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    pruned
   | |    summary:     add toto
   | |
   | | x  changeset:   8:159dfc9fa5d3
   | | |  parent:      3:0d3f46688ccc
   | | |  user:        test
   | | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |  obsolete:    rebased as 9468a5f5d8b2
   | | |  summary:     add obsol_d''
   | | |
   | | | x  changeset:   7:909a0fb57e5d
   | | |/   parent:      3:0d3f46688ccc
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    rewritten as 159dfc9fa5d3
   | | |    summary:     add obsol_d'
   | | |
   | | | x  changeset:   6:95de7fc6918d
   | | |/   parent:      3:0d3f46688ccc
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    rewritten as 909a0fb57e5d
   | | |    summary:     add obsol_d
   | | |
   | | | x  changeset:   5:a7a6f2b5d8a5
   | | |/   parent:      3:0d3f46688ccc
   | | |    user:        test
   | | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | | |    obsolete:    rewritten as 95de7fc6918d
-  | | |    obsolete:    rewritten as 50f11e5e3a63
   | | |    summary:     add d
   | | |
   | o |  changeset:   4:725c380fe99b
@@ -827,14 +805,11 @@
   | |/   parent:      1:7c3bad9141dc
   | |    user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    rewritten as 725c380fe99b
-  | |    obsolete:    rebased as 2033b4e49474
   | |    summary:     add obsol_c
   | |
   x |  changeset:   2:4538525df7e2
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 0d3f46688ccc
   |    summary:     add c
   |
   o  changeset:   1:7c3bad9141dc
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-partial-C1.t
--- a/tests/test-push-checkheads-partial-C1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-partial-C1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -57,7 +57,6 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-partial-C2.t
--- a/tests/test-push-checkheads-partial-C2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-partial-C2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,7 +59,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-partial-C3.t
--- a/tests/test-push-checkheads-partial-C3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-partial-C3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,7 +59,6 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-partial-C4.t
--- a/tests/test-push-checkheads-partial-C4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-partial-C4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,7 +59,6 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B1.t
--- a/tests/test-push-checkheads-pruned-B1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -49,7 +49,6 @@
   $ mkcommit B0
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  74ff5441d343 (draft): B0
   |
@@ -69,6 +68,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B2.t
--- a/tests/test-push-checkheads-pruned-B2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,9 +59,7 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
@@ -83,6 +81,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B3.t
--- a/tests/test-push-checkheads-pruned-B3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,9 +59,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
@@ -83,7 +81,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
 
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B4.t
--- a/tests/test-push-checkheads-pruned-B4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -60,9 +60,7 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
@@ -84,6 +82,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B5.t
--- a/tests/test-push-checkheads-pruned-B5.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t	Fri Oct 20 18:34:22 2017 +0200
@@ -63,11 +63,8 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete --record-parents `getid "desc(A0)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(C0)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
@@ -91,6 +88,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
-  obsoleted 3 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B6.t
--- a/tests/test-push-checkheads-pruned-B6.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B6.t	Fri Oct 20 18:34:22 2017 +0200
@@ -52,9 +52,7 @@
   $ hg up 'desc(B0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   x  ba93660aff8d (draft): A1
   |
@@ -76,6 +74,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B7.t
--- a/tests/test-push-checkheads-pruned-B7.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B7.t	Fri Oct 20 18:34:22 2017 +0200
@@ -51,9 +51,7 @@
   $ hg up 'desc(B0)'
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   x  ba93660aff8d (draft): A1
   |
@@ -75,6 +73,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-pruned-B8.t
--- a/tests/test-push-checkheads-pruned-B8.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t	Fri Oct 20 18:34:22 2017 +0200
@@ -66,13 +66,9 @@
   $ mkcommit A2
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  c1f8d089020f (draft): A2
   |
@@ -98,6 +94,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   4 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A1.t
--- a/tests/test-push-checkheads-superceed-A1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -46,7 +46,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  f6082bc4ffef (draft): A1
   |
@@ -66,6 +65,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A2.t
--- a/tests/test-push-checkheads-superceed-A2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -59,9 +59,7 @@
   created new head
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  262c8c798096 (draft): B1
   |
@@ -85,6 +83,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A3.t
--- a/tests/test-push-checkheads-superceed-A3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -62,9 +62,7 @@
   created new head
   $ mkcommit A1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  c1c7524e9488 (draft): A1
   |
@@ -88,6 +86,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A4.t
--- a/tests/test-push-checkheads-superceed-A4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -48,7 +48,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ mkcommit B0
   $ hg log -G --hidden
   @  f40ded968333 (draft): B0
@@ -71,6 +70,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../../
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A5.t
--- a/tests/test-push-checkheads-superceed-A5.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A5.t	Fri Oct 20 18:34:22 2017 +0200
@@ -49,7 +49,6 @@
   created new head
   $ mkcommit A1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  ba93660aff8d (draft): A1
   |
@@ -71,7 +70,6 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
 
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A6.t
--- a/tests/test-push-checkheads-superceed-A6.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t	Fri Oct 20 18:34:22 2017 +0200
@@ -68,9 +68,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  d70a1f75a020 (draft): B1
   |
@@ -96,6 +94,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A7.t
--- a/tests/test-push-checkheads-superceed-A7.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t	Fri Oct 20 18:34:22 2017 +0200
@@ -68,9 +68,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
@@ -96,6 +94,5 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 2 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-superceed-A8.t
--- a/tests/test-push-checkheads-superceed-A8.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-superceed-A8.t	Fri Oct 20 18:34:22 2017 +0200
@@ -53,9 +53,7 @@
   $ mkcommit A2
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  c1f8d089020f (draft): A2
   |
@@ -77,6 +75,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D1.t
--- a/tests/test-push-checkheads-unpushed-D1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -49,7 +49,6 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit B0
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D2.t
--- a/tests/test-push-checkheads-unpushed-D2.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t	Fri Oct 20 18:34:22 2017 +0200
@@ -63,9 +63,7 @@
   $ mkcommit A1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(B0)"`
-  obsoleted 1 changesets
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit C0
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D3.t
--- a/tests/test-push-checkheads-unpushed-D3.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t	Fri Oct 20 18:34:22 2017 +0200
@@ -66,9 +66,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D4.t
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 20 18:34:22 2017 +0200
@@ -82,9 +82,7 @@
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mkcommit B1
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  d70a1f75a020 (draft): B1
   |
@@ -120,6 +118,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D5.t
--- a/tests/test-push-checkheads-unpushed-D5.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t	Fri Oct 20 18:34:22 2017 +0200
@@ -71,9 +71,7 @@
   $ mkcommit B1
   created new head
   $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  25c56d33e4c4 (draft): B1
   |
@@ -105,6 +103,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D6.t
--- a/tests/test-push-checkheads-unpushed-D6.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D6.t	Fri Oct 20 18:34:22 2017 +0200
@@ -56,9 +56,7 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-push-checkheads-unpushed-D7.t
--- a/tests/test-push-checkheads-unpushed-D7.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-push-checkheads-unpushed-D7.t	Fri Oct 20 18:34:22 2017 +0200
@@ -65,11 +65,8 @@
   $ mkcommit C0
   created new head
   $ hg debugobsolete `getid "desc(A0)"` `getid "desc(A1)"`
-  obsoleted 1 changesets
   $ hg debugobsolete `getid "desc(A1)"` `getid "desc(A2)"`
-  obsoleted 1 changesets
   $ hg debugobsolete --record-parents `getid "desc(A2)"`
-  obsoleted 1 changesets
   $ hg log -G --hidden
   @  0f88766e02d6 (draft): C0
   |
@@ -95,6 +92,5 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   3 new obsolescence markers
-  obsoleted 1 changesets
 
   $ cd ../..
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-sharing.t
--- a/tests/test-sharing.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-sharing.t	Fri Oct 20 18:34:22 2017 +0200
@@ -88,9 +88,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to "60ffde5765c5: fix bug 37"
   1 other heads for branch "default"
 
 Figure SG03
@@ -122,7 +120,6 @@
   $ cd ../test-repo
   $ hg update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  updated to "de6151c48e1c: fix bug 37"
   1 other heads for branch "default"
   $ hg shortlog --hidden -G
   @  4:de6151c48e1c  draft  fix bug 37
@@ -213,7 +210,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   updating bookmark bug15
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -258,7 +254,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   updating bookmark featureX
 
 Bob receives second review, amends, and pushes to public:
@@ -284,7 +279,6 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
   2 new obsolescence markers
-  obsoleted 1 changesets
   updating bookmark featureX
   $ hg -R ../review bookmarks
      bug15                     3:cbdfbd5a5db2
@@ -400,7 +394,6 @@
   adding file changes
   added 1 changesets with 0 changes to 1 files
   1 new obsolescence markers
-  obsoleted 1 changesets
   updating bookmark bug15
 
 Figure SG08: review and public changesets after Alice pushes.
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-stabilize-conflict.t	Fri Oct 20 18:34:22 2017 +0200
@@ -152,7 +152,6 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as e04690b09bc6
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
@@ -244,7 +243,6 @@
   |/   parent:      0:29ec1554cfaf
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    amended as b20d08eea373
   |    summary:     babar count up to ten
   |
   o  changeset:   0:29ec1554cfaf
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-stabilize-order.t
--- a/tests/test-stabilize-order.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-stabilize-order.t	Fri Oct 20 18:34:22 2017 +0200
@@ -220,7 +220,6 @@
   | x  changeset:   12:2256dae6521f
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as f83a0bce03e4
   |    summary:     addc
   |
   o  changeset:   11:7a68bc4596ea
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-topic-change.t
--- a/tests/test-topic-change.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-topic-change.t	Fri Oct 20 18:34:22 2017 +0200
@@ -302,7 +302,10 @@
 
   $ hg glog
   @  34:c48d6d71b2d9 {}
-  |  Added h  (book)
+  |  Added h  ()
+  |
+  | x  33:a24c31c35013 {watwat}
+  |/   Added h  (book)
   |
   o  26:7c76c271395f {bar}
   |  Added g  ()
@@ -334,7 +337,13 @@
   changed topic on 1 changes
   $ hg glog
   @  35:1b83d11095b9 {movebook}
-  |  Added h  (book bookboo)
+  |  Added h  ()
+  |
+  | x  34:c48d6d71b2d9 {}
+  |/   Added h  (bookboo)
+  |
+  | x  33:a24c31c35013 {watwat}
+  |/   Added h  (book)
   |
   o  26:7c76c271395f {bar}
   |  Added g  ()
@@ -378,7 +387,13 @@
   |  Added g  ()
   |
   | o  35:1b83d11095b9 {movebook}
-  | |  Added h  (book bookboo)
+  | |  Added h  ()
+  | |
+  | | x  34:c48d6d71b2d9 {}
+  | |/   Added h  (bookboo)
+  | |
+  | | x  33:a24c31c35013 {watwat}
+  | |/   Added h  (book)
   | |
   | x  26:7c76c271395f {bar}
   |/   Added g  ()
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-topic-debugcb.t
--- a/tests/test-topic-debugcb.t	Fri Oct 20 18:25:05 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-==================================================
-Test for `hg debugconvertbookmark` added by topics
-==================================================
-
-  $ . "$TESTDIR/testlib/topic_setup.sh"
-
-  $ cat << EOF >> $HGRCPATH
-  > drawdag=$RUNTESTDIR/drawdag.py
-  > [ui]
-  > logtemplate = [{rev}:{node|short}] {desc|firstline}\n\
-  > {if(bookmarks, "  bookmark: {join(bookmarks,"\n  bookmark:")}\n")}\
-  > {if(topics, "  topic: {topics}\n")}
-  > EOF
-
-Setting up the things
----------------------
-
-  $ hg init repo
-  $ cd repo
-  $ echo "Hello" > root
-  $ hg commit -Aqm "root"
-  $ hg phase --public .
-  $ echo "Hello" > a
-  $ hg commit -Aqm "First commit"
-  $ echo "Hello" > b
-  $ hg commit -Aqm "Second commit"
-  $ hg bookmark "hellos"
-  $ hg up 0 -q
-  $ echo "Fix 1" > l
-  $ hg commit -Aqm "Fixing first"
-  $ echo "Fix 2" > m
-  $ hg commit -Aqm "Fixing second"
-  $ hg bookmark "secondfix"
-
-  $ hg log -G
-  @  [4:ec0e17135a94] Fixing second
-  |    bookmark: secondfix
-  o  [3:e05947b88d69] Fixing first
-  |
-  | o  [2:f53d1144f925] Second commit
-  | |    bookmark: hellos
-  | o  [1:df1fd5e18154] First commit
-  |/
-  o  [0:249055fcca50] root
-  
-
-Generic tests
-=============
-
-Help for the command
---------------------
-
-  $ hg help debugconvertbookmark
-  hg debugcb [-b BOOKMARK] [--all]
-  
-  aliases: debugconvertbookmark
-  
-  Converts a bookmark to a topic with the same name.
-  
-  options:
-  
-   -b --bookmark VALUE bookmark to convert to topic
-      --all            convert all bookmarks to topics
-  
-  (some details hidden, use --verbose to show complete help)
-
-Running without any argument
-----------------------------
-
-  $ hg debugconvertbookmark
-  abort: you must specify either '--all' or '-b'
-  [255]
-
-Changing a particular bookmark to topic
-=======================================
-
-  $ hg debugconvertbookmark -b hellos
-  changed topic to "hellos" on 2 revisions
-  $ hg log -G
-  o  [6:98ae7930f6ed] Second commit
-  |    topic: hellos
-  o  [5:ff69f6ee4618] First commit
-  |    topic: hellos
-  | @  [4:ec0e17135a94] Fixing second
-  | |    bookmark: secondfix
-  | o  [3:e05947b88d69] Fixing first
-  |/
-  o  [0:249055fcca50] root
-  
-
-Changing all bookmarks to topic
-===============================
-
-Simple test
------------
-
-  $ hg debugconvertbookmark --all
-  switching to topic secondfix
-  changed topic to "secondfix" on 2 revisions
-  $ hg log -G
-  @  [8:5f0f9cc1979a] Fixing second
-  |    topic: secondfix
-  o  [7:f8ecbf3b10be] Fixing first
-  |    topic: secondfix
-  | o  [6:98ae7930f6ed] Second commit
-  | |    topic: hellos
-  | o  [5:ff69f6ee4618] First commit
-  |/     topic: hellos
-  o  [0:249055fcca50] root
-  
-
-Trying with multiple bookmarks on a single changeset
-----------------------------------------------------
-
-  $ echo "multiple bookmarks" >> m
-  $ hg commit -Aqm "Trying multiple bookmarks"
-  $ hg bookmark book1
-  $ hg bookmark book2
-  $ hg log -G
-  @  [9:4ad3e7d421d4] Trying multiple bookmarks
-  |    bookmark: book1
-  |    bookmark:book2
-  |    topic: secondfix
-  o  [8:5f0f9cc1979a] Fixing second
-  |    topic: secondfix
-  o  [7:f8ecbf3b10be] Fixing first
-  |    topic: secondfix
-  | o  [6:98ae7930f6ed] Second commit
-  | |    topic: hellos
-  | o  [5:ff69f6ee4618] First commit
-  |/     topic: hellos
-  o  [0:249055fcca50] root
-  
-  $ hg debugconvertbookmark --all
-  skipping '9' as it has multiple bookmarks on it
-  $ hg log -G
-  @  [9:4ad3e7d421d4] Trying multiple bookmarks
-  |    bookmark: book1
-  |    bookmark:book2
-  |    topic: secondfix
-  o  [8:5f0f9cc1979a] Fixing second
-  |    topic: secondfix
-  o  [7:f8ecbf3b10be] Fixing first
-  |    topic: secondfix
-  | o  [6:98ae7930f6ed] Second commit
-  | |    topic: hellos
-  | o  [5:ff69f6ee4618] First commit
-  |/     topic: hellos
-  o  [0:249055fcca50] root
-  
-
-Two bookmarks on two different topological branches
----------------------------------------------------
-
-  $ cd ..
-  $ rm -rf repo
-  $ hg init setup1
-  $ cd setup1
-  $ echo "Hello" > root
-  $ hg commit -Aqm "root"
-  $ hg phase --public .
-  $ echo "Hello" > A
-  $ hg commit -Aqm "A"
-  $ echo "Hello" > B
-  $ hg commit -Aqm "B"
-  $ echo "Hello" > C
-  $ hg commit -Aqm "C"
-  $ echo "Hello" > D
-  $ hg commit -Aqm "D"
-  $ hg up 'desc(B)'
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ echo "Hello" > E
-  $ hg commit -Aqm "E"
-  $ echo "Hello" > F
-  $ hg commit -Aqm "F"
-  $ hg bookmark -r 'desc(D)' bar
-  $ hg bookmark -r 'desc(F)' foo
-
-  $ hg log -G
-  @  [6:32f4660df717] F
-  |    bookmark: foo
-  o  [5:d4608d9df75e] E
-  |
-  | o  [4:4963af405f62] D
-  | |    bookmark: bar
-  | o  [3:ac05e0d05d00] C
-  |/
-  o  [2:10f317d09e78] B
-  |
-  o  [1:e34122c9a2bf] A
-  |
-  o  [0:249055fcca50] root
-  
-  $ hg debugconvertbookmark --all
-  changed topic to "bar" on 2 revisions
-  switching to topic foo
-  changed topic to "foo" on 2 revisions
-  $ hg log -G
-  @  [10:f0b5f2a5f31a] F
-  |    topic: foo
-  o  [9:7affa1350ff0] E
-  |    topic: foo
-  | o  [8:a1bb64d88f0e] D
-  | |    topic: bar
-  | o  [7:71827f564e9e] C
-  |/     topic: bar
-  o  [2:10f317d09e78] B
-  |
-  o  [1:e34122c9a2bf] A
-  |
-  o  [0:249055fcca50] root
-  
-
-Two bookmarks on top of each other
-----------------------------------
-
-  $ cd ..
-  $ rm -rf setup1
-  $ hg init setup2
-  $ cd setup2
-  $ echo "Hello" > root
-  $ hg commit -Aqm "root"
-  $ hg phase --public .
-  $ echo "Hello" > A
-  $ hg commit -Aqm "A"
-  $ hg phase --public .
-  $ echo "Hello" > B
-  $ hg commit -Aqm "B"
-  $ echo "Hello" > C
-  $ hg commit -Aqm "C"
-  $ hg bookmark -r . bar
-  $ echo "Hello" > D
-  $ hg commit -Aqm "D"
-  $ echo "Hello" > E
-  $ hg commit -Aqm "E"
-  $ hg bookmark -r . foo
-
-  $ hg log -G
-  @  [5:c633aa1ad270] E
-  |    bookmark: foo
-  o  [4:4963af405f62] D
-  |
-  o  [3:ac05e0d05d00] C
-  |    bookmark: bar
-  o  [2:10f317d09e78] B
-  |
-  o  [1:e34122c9a2bf] A
-  |
-  o  [0:249055fcca50] root
-  
-
-XXX: this should  avoid create orphan changesets.
-
-  $ hg debugconvertbookmark --all
-  changed topic to "bar" on 2 revisions
-  switching to topic foo
-  changed topic to "foo" on 2 revisions
-
-  $ hg log -G
-  @  [9:b14d13efcfa7] E
-  |    topic: foo
-  o  [8:c89ca6e70978] D
-  |    topic: foo
-  | o  [7:a3ea0dfe6a10] C
-  | |    topic: bar
-  | o  [6:db1bc6aab480] B
-  | |    topic: bar
-  x |  [3:ac05e0d05d00] C
-  | |
-  x |  [2:10f317d09e78] B
-  |/
-  o  [1:e34122c9a2bf] A
-  |
-  o  [0:249055fcca50] root
-  
-
-Check that phase are properly take in account
----------------------------------------------
-
-(we reuse above test, taking advantage of a small bug regarding stacked bookmarks. we can fuse the two tests once that bug is fixed)
-
-  $ cd ..
-  $ hg init setup-phases
-  $ cd setup-phases
-  $ echo "Hello" > root
-  $ hg commit -Aqm "root"
-  $ hg phase --public .
-  $ echo "Hello" > A
-  $ hg commit -Aqm "A"
-  $ echo "Hello" > B
-  $ hg commit -Aqm "B"
-  $ echo "Hello" > C
-  $ hg commit -Aqm "C"
-  $ hg bookmark -r . bar
-  $ hg log -G
-  @  [3:ac05e0d05d00] C
-  |    bookmark: bar
-  o  [2:10f317d09e78] B
-  |
-  o  [1:e34122c9a2bf] A
-  |
-  o  [0:249055fcca50] root
-  
-
-  $ hg debugconvertbookmark --all
-  switching to topic bar
-  changed topic to "bar" on 3 revisions
-  $ hg log -G
-  @  [6:863c43a7951c] C
-  |    topic: bar
-  o  [5:ac7f12ac947f] B
-  |    topic: bar
-  o  [4:fc82c8c14b4c] A
-  |    topic: bar
-  o  [0:249055fcca50] root
-  
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-topic-stack.t
--- a/tests/test-topic-stack.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-topic-stack.t	Fri Oct 20 18:34:22 2017 +0200
@@ -832,7 +832,7 @@
   t2@ c_G (current)
   t1: c_D
   t0^ c_A (base)
-  $ hg --config extensions.evolve=  --config ui.interactive=yes split << EOF
+  $ hg --config extensions.evolve=  --config ui.interactive=yes split --date '0 0' << EOF
   > y
   > y
   > n
@@ -861,16 +861,16 @@
   | @  e7ea874afbd5 (23) c_G
   |/
   x  b24bab30ac12 (21) c_G
-  |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (*) (glob)
   |
   x  907f7d3c2333 (18) c_G
-  |    rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten as b24bab30ac12 by test (*) (glob)
   |
   x  3ab2eedae500 (13) c_G
-  |    rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten as 907f7d3c2333 by test (*) (glob)
   |
   x  c7d60a180d05 (6) c_G
-       rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten as 3ab2eedae500 by test (*) (glob)
   
   $ hg export .
   # HG changeset patch
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-topic-tutorial.t
--- a/tests/test-topic-tutorial.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-topic-tutorial.t	Fri Oct 20 18:34:22 2017 +0200
@@ -1225,7 +1225,6 @@
   |/   topic:       tools
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as b7509bd417f8
   |    summary:     Adding hammer
   |
   o  changeset:   12:fbff9bc37a43
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-topic.t
--- a/tests/test-topic.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-topic.t	Fri Oct 20 18:34:22 2017 +0200
@@ -653,7 +653,7 @@
   t0^ Add file delta (base current)
 
   $ hg topics --age
-   * fran (1970-01-01 by test)
+   * fran (* by test) (glob)
 
   $ cd ..
 
@@ -701,11 +701,11 @@
 
   $ hg add b
   $ hg topic topic1990
-  $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo"
+  $ hg ci -m "Added b" --config devel.default-date="631152000 0" --user "foo" --date "631152000 0"
   active topic 'topic1990' grew its first changeset
   $ hg add c
   $ hg topic topic2010
-  $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar"
+  $ hg ci -m "Added c" --config devel.default-date="1262304000 0" --user "bar" --date "1262304000 0"
   active topic 'topic2010' grew its first changeset
 
   $ hg log -G
@@ -735,18 +735,18 @@
    * topic2010 (1 changesets)
 
   $ hg topics --age
-   * topic2010 (2010-01-01 by bar)
-     topic1990 (1990-01-01 by foo)
-     topic1970 (1970-01-01 by test)
+     topic1970 (* by test) (glob)
+   * topic2010 (* by bar) (glob)
+     topic1990 (* by foo) (glob)
 
   $ hg up topic1970
   switching to topic topic1970
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 
   $ hg topics --age
-     topic2010 (2010-01-01 by bar)
-     topic1990 (1990-01-01 by foo)
-   * topic1970 (1970-01-01 by test)
+   * topic1970 (* by test) (glob)
+     topic2010 (* by bar) (glob)
+     topic1990 (* by foo) (glob)
 
   $ hg topics --age random
   abort: cannot use --age while setting a topic
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-tutorial.t	Fri Oct 20 18:34:22 2017 +0200
@@ -1498,7 +1498,6 @@
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
   3 new obsolescence markers
-  obsoleted 2 changesets
 
 Remote get a warning that current working directory is based on an obsolete
 changeset.
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-uncommit-interactive.t
--- a/tests/test-uncommit-interactive.t	Fri Oct 20 18:25:05 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,908 +0,0 @@
-================================================
-||  The test for `hg uncommit --interactive`  ||
-================================================
-
-Repo Setup
-============
-
-  $ . $TESTDIR/testlib/common.sh
-  $ cat >> $HGRCPATH <<EOF
-  > [ui]
-  > interactive = true
-  > [extensions]
-  > evolve =
-  > EOF
-
-  $ glog() {
-  >   hg log -G --template '{rev}:{node|short}@{branch}({separate("/", obsolete, phase)}) {desc|firstline}\n' "$@"
-  > }
-
-  $ hg init repo
-  $ cd repo
-
-  $ touch a
-  $ cat >> a << EOF
-  > 1
-  > 2
-  > 3
-  > 4
-  > 5
-  > EOF
-
-  $ hg add a
-  $ hg ci -m "The base commit"
-
-Make sure aborting the interactive selection does no magic
-----------------------------------------------------------
-
-  $ hg status
-  $ hg uncommit -i<<EOF
-  > q
-  > EOF
-  diff --git a/a b/a
-  new file mode 100644
-  examine changes to 'a'? [Ynesfdaq?] q
-  
-  abort: user quit
-  [255]
-  $ hg status
-
-Make a commit with multiple hunks
----------------------------------
-
-  $ cat > a << EOF
-  > -2
-  > -1
-  > 0
-  > 1
-  > 2
-  > 3
-  > foo
-  > bar
-  > 4
-  > 5
-  > babar
-  > EOF
-
-  $ hg diff
-  diff -r 7733902a8d94 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,11 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  +babar
-
-  $ hg ci -m "another one"
-
-Not selecting anything to uncommit
-==================================
-
-  $ hg uncommit -i<<EOF
-  > y
-  > n
-  > n
-  > n
-  > EOF
-  diff --git a/a b/a
-  3 hunks, 6 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  discard change 1/3 to 'a'? [Ynesfdaq?] n
-  
-  @@ -1,5 +4,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  discard change 2/3 to 'a'? [Ynesfdaq?] n
-  
-  @@ -4,2 +9,3 @@
-   4
-   5
-  +babar
-  discard change 3/3 to 'a'? [Ynesfdaq?] n
-  
-  abort: nothing selected to uncommit
-  [255]
-  $ hg status
-
-Uncommit a chunk
-================
-
-  $ hg amend --extract -i<<EOF
-  > y
-  > y
-  > n
-  > n
-  > EOF
-  diff --git a/a b/a
-  3 hunks, 6 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  discard change 1/3 to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,5 +4,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  discard change 2/3 to 'a'? [Ynesfdaq?] n
-  
-  @@ -4,2 +9,3 @@
-   4
-   5
-  +babar
-  discard change 3/3 to 'a'? [Ynesfdaq?] n
-  
-The unselected part should be in the diff
------------------------------------------
-
-  $ hg diff
-  diff -r 678a59e5ff90 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-
-The commit should contain the rest of part
-------------------------------------------
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 678a59e5ff90754d5e94719bd82ad169be773c21
-  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
-  another one
-  
-  diff -r 7733902a8d94 -r 678a59e5ff90 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,8 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  +babar
-
-Uncommiting on dirty working directory
-======================================
-
-  $ hg status
-  M a
-  $ hg diff
-  diff -r 678a59e5ff90 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-
-  $ hg uncommit -i<<EOF
-  > y
-  > n
-  > y
-  > EOF
-  diff --git a/a b/a
-  2 hunks, 3 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,5 +1,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  discard change 1/2 to 'a'? [Ynesfdaq?] n
-  
-  @@ -4,2 +6,3 @@
-   4
-   5
-  +babar
-  discard change 2/2 to 'a'? [Ynesfdaq?] y
-  
-  patching file a
-  Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
-
-  $ hg diff
-  diff -r 46e35360be47 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  @@ -5,3 +8,4 @@
-   bar
-   4
-   5
-  +babar
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 46e35360be473bf761bedf3d05de4a68ffd9d9f8
-  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
-  another one
-  
-  diff -r 7733902a8d94 -r 46e35360be47 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-
-Checking the obsolescence history
-
-  $ hg obslog
-  @  46e35360be47 (5) another one
-  |
-  x  678a59e5ff90 (3) another one
-  |    rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
-  |
-  x  f70fb463d5bf (1) another one
-       rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
-  
-
-Push the changes back to the commit and more commits for more testing
-
-  $ hg amend
-  $ glog
-  @  7:905eb2a23ea2@default(draft) another one
-  |
-  o  0:7733902a8d94@default(draft) The base commit
-  
-  $ touch foo
-  $ echo "hey" >> foo
-  $ hg ci -Am "Added foo"
-  adding foo
-
-Testing uncommiting a whole changeset and also for a file addition
-==================================================================
-
-  $ hg uncommit -i<<EOF
-  > y
-  > y
-  > EOF
-  diff --git a/foo b/foo
-  new file mode 100644
-  examine changes to 'foo'? [Ynesfdaq?] y
-  
-  @@ -0,0 +1,1 @@
-  +hey
-  discard this change to 'foo'? [Ynesfdaq?] y
-  
-  new changeset is empty
-  (use 'hg prune .' to remove it)
-
-  $ hg status
-  A foo
-  $ hg diff
-  diff -r 857367499298 foo
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +hey
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 857367499298e999b5841bb01df65f73088b5d3b
-  # Parent  905eb2a23ea2d92073419d0e19165b90d36ea223
-  Added foo
-  
-  $ hg amend
-
-Testing to uncommit removed files completely
-============================================
-
-  $ hg rm a
-  $ hg ci -m "Removed a"
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 219cfe20964e93f8bb9bd82ceaa54d3b776046db
-  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
-  Removed a
-  
-  diff -r 42cc15efbec2 -r 219cfe20964e a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,11 +0,0 @@
-  --2
-  --1
-  -0
-  -1
-  -2
-  -3
-  -foo
-  -bar
-  -4
-  -5
-  -babar
-
-Not examining the file
-----------------------
-
-  $ hg uncommit -i<<EOF
-  > n
-  > EOF
-  diff --git a/a b/a
-  deleted file mode 100644
-  examine changes to 'a'? [Ynesfdaq?] n
-  
-  abort: nothing selected to uncommit
-  [255]
-
-Examining the file
-------------------
-XXX: there is a bug in interactive selection as it is not letting to examine the
-file. Tried with curses too. In the curses UI, if you just unselect the hunks
-and the not file mod thing at the top, it will show the same "nothing unselected
-to uncommit" message which is a bug in interactive selection.
-
-  $ hg uncommit -i<<EOF
-  > y
-  > EOF
-  diff --git a/a b/a
-  deleted file mode 100644
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  new changeset is empty
-  (use 'hg prune .' to remove it)
-
-  $ hg diff
-  diff -r 737487f1e5f8 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,11 +0,0 @@
-  --2
-  --1
-  -0
-  -1
-  -2
-  -3
-  -foo
-  -bar
-  -4
-  -5
-  -babar
-  $ hg status
-  R a
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 737487f1e5f853e55decb73ea31522c63e7f5980
-  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
-  Removed a
-  
-
-  $ hg prune .
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory now at 42cc15efbec2
-  1 changesets pruned
-  $ hg revert --all
-  undeleting a
-
-  $ glog
-  @  12:42cc15efbec2@default(draft) Added foo
-  |
-  o  7:905eb2a23ea2@default(draft) another one
-  |
-  o  0:7733902a8d94@default(draft) The base commit
-  
-
-Testing when a new file is added in the last commit
-===================================================
-
-  $ echo "foo" >> foo
-  $ touch x
-  $ echo "abcd" >> x
-  $ hg add x
-  $ hg ci -m "Added x"
-  $ hg uncommit -i<<EOF
-  > y
-  > y
-  > y
-  > n
-  > EOF
-  diff --git a/foo b/foo
-  1 hunks, 1 lines changed
-  examine changes to 'foo'? [Ynesfdaq?] y
-  
-  @@ -1,1 +1,2 @@
-   hey
-  +foo
-  discard change 1/2 to 'foo'? [Ynesfdaq?] y
-  
-  diff --git a/x b/x
-  new file mode 100644
-  examine changes to 'x'? [Ynesfdaq?] y
-  
-  @@ -0,0 +1,1 @@
-  +abcd
-  discard change 2/2 to 'x'? [Ynesfdaq?] n
-  
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 25a080d13cb23dbd014839f54d99a96e57ba7e9b
-  # Parent  42cc15efbec26c14d96d805dee2766ba91d1fd31
-  Added x
-  
-  diff -r 42cc15efbec2 -r 25a080d13cb2 x
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/x	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +abcd
-
-  $ hg diff
-  diff -r 25a080d13cb2 foo
-  --- a/foo	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/foo	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,1 +1,2 @@
-   hey
-  +foo
-
-  $ hg status
-  M foo
-
-  $ hg revert --all
-  reverting foo
-
-Testing between the stack and with dirty working copy
-=====================================================
-
-  $ glog
-  @  18:25a080d13cb2@default(draft) Added x
-  |
-  o  12:42cc15efbec2@default(draft) Added foo
-  |
-  o  7:905eb2a23ea2@default(draft) another one
-  |
-  o  0:7733902a8d94@default(draft) The base commit
-  
-  $ hg up 905eb2a23ea2
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-
-  $ touch bar
-  $ echo "foo" >> bar
-  $ hg add bar
-  $ hg status
-  A bar
-  ? foo.orig
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 905eb2a23ea2d92073419d0e19165b90d36ea223
-  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
-  another one
-  
-  diff -r 7733902a8d94 -r 905eb2a23ea2 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,11 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  +babar
-
-  $ hg uncommit -i<<EOF
-  > y
-  > n
-  > n
-  > y
-  > EOF
-  diff --git a/a b/a
-  3 hunks, 6 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  discard change 1/3 to 'a'? [Ynesfdaq?] n
-  
-  @@ -1,5 +4,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  discard change 2/3 to 'a'? [Ynesfdaq?] n
-  
-  @@ -4,2 +9,3 @@
-   4
-   5
-  +babar
-  discard change 3/3 to 'a'? [Ynesfdaq?] y
-  
-  patching file a
-  Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
-  2 new unstable changesets
-
-  $ hg diff
-  diff -r 676366511f95 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -8,3 +8,4 @@
-   bar
-   4
-   5
-  +babar
-  diff -r 676366511f95 bar
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +foo
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 676366511f95ca4122413dcf79b45eaab61fb387
-  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
-  another one
-  
-  diff -r 7733902a8d94 -r 676366511f95 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,10 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  $ hg status
-  M a
-  A bar
-  ? foo.orig
-
-More uncommit on the same dirty working copy
-=============================================
-
-  $ hg uncommit -i<<EOF
-  > y
-  > y
-  > n
-  > EOF
-  diff --git a/a b/a
-  2 hunks, 5 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  discard change 1/2 to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,5 +4,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-  discard change 2/2 to 'a'? [Ynesfdaq?] n
-  
-
-  $ hg exp
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 62d907d0c4fa13b4b8bfeed05f13751035daf963
-  # Parent  7733902a8d94c789ca81d866bea1893d79442db6
-  another one
-  
-  diff -r 7733902a8d94 -r 62d907d0c4fa a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,5 +1,7 @@
-   1
-   2
-   3
-  +foo
-  +bar
-   4
-   5
-
-  $ hg diff
-  diff -r 62d907d0c4fa a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,6 @@
-  +-2
-  +-1
-  +0
-   1
-   2
-   3
-  @@ -5,3 +8,4 @@
-   bar
-   4
-   5
-  +babar
-  diff -r 62d907d0c4fa bar
-  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
-  @@ -0,0 +1,1 @@
-  +foo
-
-  $ hg status
-  M a
-  A bar
-  ? foo.orig
-
-Interactive uncommit with a pattern
------------------------------------
-
-(more setup)
-
-  $ hg ci -m 'roaming changes'
-  $ cat > b << EOF
-  > a
-  > b
-  > c
-  > d
-  > e
-  > f
-  > h
-  > EOF
-  $ hg add b
-  $ hg ci -m 'add b'
-  $ echo 'celeste' >> a
-  $ echo 'i' >> b
-  $ hg ci -m 'some more changes'
-  $ hg export
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID be5c67225e80b050867862bbd9f4755c4e9207c5
-  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
-  some more changes
-  
-  diff -r c280a907fddc -r be5c67225e80 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -9,3 +9,4 @@
-   4
-   5
-   babar
-  +celeste
-  diff -r c280a907fddc -r be5c67225e80 b
-  --- a/b	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
-  @@ -5,3 +5,4 @@
-   e
-   f
-   h
-  +i
-
-  $ hg uncommit -i a << DONE
-  > y
-  > y
-  > DONE
-  diff --git a/a b/a
-  1 hunks, 1 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -9,3 +9,4 @@
-   4
-   5
-   babar
-  +celeste
-  discard this change to 'a'? [Ynesfdaq?] y
-  
-  $ hg status
-  M a
-  ? foo.orig
-  $ hg diff
-  diff -r c701d7c8d18b a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -9,3 +9,4 @@
-   4
-   5
-   babar
-  +celeste
-  $ hg export
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID c701d7c8d18be55a92688f4458c26bd74fb1f525
-  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
-  some more changes
-  
-  diff -r c280a907fddc -r c701d7c8d18b b
-  --- a/b	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
-  @@ -5,3 +5,4 @@
-   e
-   f
-   h
-  +i
-
-(reset)
-
-  $ cat << EOF  > a
-  > -3
-  > -2
-  > -1
-  > 0
-  > 1
-  > 2
-  > 3
-  > foo
-  > bar
-  > 4
-  > 5
-  > babar
-  > celeste
-  > EOF
-  $ hg amend 
-
-Same but do not select some change in 'a'
-
-  $ hg uncommit -i a << DONE
-  > y
-  > y
-  > n
-  > DONE
-  diff --git a/a b/a
-  2 hunks, 2 lines changed
-  examine changes to 'a'? [Ynesfdaq?] y
-  
-  @@ -1,3 +1,4 @@
-  +-3
-   -2
-   -1
-   0
-  discard change 1/2 to 'a'? [Ynesfdaq?] y
-  
-  @@ -9,3 +10,4 @@
-   4
-   5
-   babar
-  +celeste
-  discard change 2/2 to 'a'? [Ynesfdaq?] n
-  
-  $ hg status
-  M a
-  ? foo.orig
-
-  $ hg diff
-  diff -r 28d5de12b225 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -1,3 +1,4 @@
-  +-3
-   -2
-   -1
-   0
-
-  $ hg export
-  # HG changeset patch
-  # User test
-  # Date 0 0
-  #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 28d5de12b225d1e0951110cced8d8994227be026
-  # Parent  c280a907fddcef2ffe9fadcc2d87f29998e22b2f
-  some more changes
-  
-  diff -r c280a907fddc -r 28d5de12b225 a
-  --- a/a	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
-  @@ -9,3 +9,4 @@
-   4
-   5
-   babar
-  +celeste
-  diff -r c280a907fddc -r 28d5de12b225 b
-  --- a/b	Thu Jan 01 00:00:00 1970 +0000
-  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
-  @@ -5,3 +5,4 @@
-   e
-   f
-   h
-  +i
-
-  $ cat b
-  a
-  b
-  c
-  d
-  e
-  f
-  h
-  i
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-userguide.t
--- a/tests/test-userguide.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-userguide.t	Fri Oct 20 18:34:22 2017 +0200
@@ -18,7 +18,7 @@
 example 2: unsafe amend with plain vanilla Mercurial: the original
 commit is stripped
   $ hg commit --amend -u alice -d '1 0' -m 'implement feature Y'
-  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend.hg (glob)
+  saved backup bundle to $TESTTMP/t/.hg/strip-backup/6e725fd2be6f-42cc74d4-amend-backup.hg (glob)
   $ hg log -r 23fe4ac6d3f1
   abort: unknown revision '23fe4ac6d3f1'!
   [255]
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-wireproto-bundle1.t
--- a/tests/test-wireproto-bundle1.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-wireproto-bundle1.t	Fri Oct 20 18:34:22 2017 +0200
@@ -70,7 +70,6 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: 2 new obsolescence markers
-  remote: obsoleted 1 changesets
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -88,7 +87,6 @@
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   2 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
diff -r 1f61525727bf -r 9c9c8c1eeb93 tests/test-wireproto.t
--- a/tests/test-wireproto.t	Fri Oct 20 18:25:05 2017 +0200
+++ b/tests/test-wireproto.t	Fri Oct 20 18:34:22 2017 +0200
@@ -74,7 +74,6 @@
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   remote: obsmarker-exchange: 151 bytes received
   remote: 2 new obsolescence markers
-  remote: obsoleted 1 changesets
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -93,7 +92,6 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   obsmarker-exchange: 151 bytes received
   2 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
@@ -138,9 +136,8 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 0 changes to 1 files (+1 heads)
-  remote: obsmarker-exchange: 226 bytes received
+  remote: obsmarker-exchange: 227 bytes received
   remote: 1 new obsolescence markers
-  remote: obsoleted 1 changesets
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
@@ -148,9 +145,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 0 changes to 1 files (+1 heads)
-  obsmarker-exchange: 226 bytes received
+  obsmarker-exchange: 227 bytes received
   1 new obsolescence markers
-  obsoleted 1 changesets
   (run 'hg heads' to see heads)
 
 test discovery avoid exchanging known markers
@@ -173,7 +169,7 @@
   (skipping discovery of obsolescence markers, will exchange everything)
   (controled by 'experimental.evolution.obsdiscovery' configuration)
   no changes found
-  remote: obsmarker-exchange: 376 bytes received
+  remote: obsmarker-exchange: 377 bytes received
   [1]
   $ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
   pulling from ssh://user@dummy/server
@@ -181,6 +177,6 @@
   no changes found
   (skipping discovery of obsolescence markers, will exchange everything)
   (controled by 'experimental.evolution.obsdiscovery' configuration)
-  obsmarker-exchange: 376 bytes received
+  obsmarker-exchange: 377 bytes received
 
   $ cd ..