--- a/tests/test-wireproto.t	Fri Aug 08 15:50:26 2014 -0700
+++ b/tests/test-wireproto.t	Fri Aug 08 23:14:00 2014 -0700
@@ -23,10 +23,6 @@
 
   $ hg clone ssh://user@dummy/server client
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in 0 nodes
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp -r client other
@@ -48,10 +44,6 @@
   pulling from ssh://user@dummy/server
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
   $ hg pull -R ../other
   pulling from ssh://user@dummy/server
   requesting all changes
@@ -59,10 +51,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   $ hg push -R ../other
   pushing to ssh://user@dummy/server
@@ -78,11 +67,7 @@
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: looking for common markers in 2 nodes
-  OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers (171 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (171 bytes)
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes
@@ -91,11 +76,6 @@
   pushing to ssh://user@dummy/server
   searching for changes
   no changes found
-  OBSEXC: computing relevant nodes
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: markers already in sync
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   [1]
 
 Pull
@@ -108,20 +88,13 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: merging obsolescence markers (171 bytes)
-  OBSEXC: 2 markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: looking for common markers in [23] nodes (re)
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
 
   $ cd ..