diff -r dcf145d0ce21 -r 3c7f98753e37 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-obsolete.t	Thu Feb 04 11:01:35 2016 +0000
@@ -184,7 +184,8 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
-  2 new obsolescence markers
+  pushing 2 obsolescence markers (13? bytes) (glob)
+  2 obsolescence markers added
   $ hg -R ../other-new verify
   checking changesets
   checking manifests
@@ -238,7 +239,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
+  pushing 3 obsolescence markers (19? bytes) (glob)
+  1 obsolescence markers added
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -260,6 +262,8 @@
   pushing to ../other-new
   searching for changes
   no changes found
+  pushing 3 obsolescence markers (19? bytes) (glob)
+  0 obsolescence markers added
   [1]
 
   $ hg up --hidden -q .^ # 3
@@ -275,8 +279,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  pull obsolescence markers
+  1 obsolescence markers added
+  (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
   - 909a0fb57e5d
@@ -365,8 +370,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  1 new obsolescence markers
-  (run 'hg heads .' to see heads, 'hg merge' to merge)
+  pull obsolescence markers
+  1 obsolescence markers added
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
   $ qlog
@@ -389,7 +395,6 @@
   branch: default
   commit: 1 deleted, 2 unknown (clean)
   update: 2 new changesets, 2 branch heads (merge)
-  phases: 4 draft
   unstable: 1 changesets
   $ qlog
   6
@@ -539,7 +544,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
-  3 new obsolescence markers
+  pushing 7 obsolescence markers (49? bytes) (glob)
+  3 obsolescence markers added
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -551,7 +557,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  1 new obsolescence markers
+  pushing 8 obsolescence markers (55? bytes) (glob)
+  1 obsolescence markers added
   $ cd ..
 
 check bumped detection
@@ -663,7 +670,6 @@
   branch: default
   commit: (clean)
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
-  phases: 3 draft
   bumped: 1 changesets
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'divergent()'