Mercurial > evolve

changeset 1088:528c066cd51c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
drop the debug output
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 29 Aug 2014 11:56:16 +0200
parents 82873af0cf10
children cdd22a5e5ef1
files tests/_exc-util.sh tests/test-exchange-A1.t tests/test-exchange-A2.t tests/test-exchange-A3.t tests/test-exchange-A4.t tests/test-exchange-A5.t tests/test-exchange-A6.t tests/test-exchange-A7.t tests/test-exchange-B1.t tests/test-exchange-B2.t tests/test-exchange-B3.t tests/test-exchange-B4.t tests/test-exchange-B5.t tests/test-exchange-B6.t tests/test-exchange-B7.t tests/test-exchange-C1.t tests/test-exchange-C2.t tests/test-exchange-C3.t tests/test-exchange-C4.t tests/test-exchange-D1.t tests/test-exchange-D2.t tests/test-exchange-D3.t tests/test-exchange-D4.t
diffstat 23 files changed, 95 insertions(+), 271 deletions(-) [+]
line wrap: on
line diff
--- a/tests/_exc-util.sh	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/_exc-util.sh	Fri Aug 29 11:56:16 2014 +0200
@@ -12,7 +12,7 @@
 publish=False
 
 [experimental]
-verbose-obsolescence-exchange=true
+verbose-obsolescence-exchange=false
 
 [alias]
 debugobsolete=debugobsolete -d '0 0'
--- a/tests/test-exchange-A1.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A1.t	Fri Aug 29 11:56:16 2014 +0200
@@ -68,14 +68,11 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -89,10 +86,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -118,14 +113,11 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -139,10 +131,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -227,14 +217,11 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -248,10 +235,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -274,14 +259,11 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -295,10 +277,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A2.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A2.t	Fri Aug 29 11:56:16 2014 +0200
@@ -76,14 +76,11 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -98,10 +95,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A3.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A3.t	Fri Aug 29 11:56:16 2014 +0200
@@ -88,14 +88,11 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,10 +107,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -173,8 +168,6 @@
   $ hg push -R main -r e5ea8f9c7314 pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   abort: push creates new remote head e5ea8f9c7314!
   (merge or see "hg help push" for details about pushing new heads)
   [255]
@@ -194,14 +187,11 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -216,10 +206,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 2 files (+1 heads)
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
   ## post pull state
--- a/tests/test-exchange-A4.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A4.t	Fri Aug 29 11:56:16 2014 +0200
@@ -81,14 +81,11 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -103,10 +100,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A5.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A5.t	Fri Aug 29 11:56:16 2014 +0200
@@ -88,14 +88,11 @@
   ## pushing "B1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -111,10 +108,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A6.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A6.t	Fri Aug 29 11:56:16 2014 +0200
@@ -79,11 +79,8 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -93,10 +90,8 @@
   ## pulling "e5ea8f9c7314" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -118,11 +113,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (65 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (65 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -133,10 +125,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (65 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-A7.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-A7.t	Fri Aug 29 11:56:16 2014 +0200
@@ -59,11 +59,7 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -72,9 +68,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
+  pull obsolescence markers
   ## post pull state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B1.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B1.t	Fri Aug 29 11:56:16 2014 +0200
@@ -67,14 +67,11 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -88,10 +85,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -114,14 +109,11 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -135,10 +127,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-B2.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B2.t	Fri Aug 29 11:56:16 2014 +0200
@@ -62,11 +62,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -76,10 +73,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -101,11 +96,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -116,10 +108,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B3.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B3.t	Fri Aug 29 11:56:16 2014 +0200
@@ -75,14 +75,10 @@
   ## pushing "A" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   ## post push state
   # obstore: main
   e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -95,9 +91,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
+  pull obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-B4.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B4.t	Fri Aug 29 11:56:16 2014 +0200
@@ -88,11 +88,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -102,10 +99,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -127,11 +122,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   no changes found
-  OBSEXC: pushing 1 obsolescence markers (89 bytes)
-  OBSEXC: DONE
+  pushing 1 obsolescence markers (89 bytes)
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -142,10 +134,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (89 bytes)
-  OBSEXC: 1 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  1 obsolescence markers added
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B5.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B5.t	Fri Aug 29 11:56:16 2014 +0200
@@ -87,14 +87,11 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,10 +107,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state
@@ -142,14 +137,11 @@
   ## pushing "B" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 3 nodes
   adding changesets
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -165,10 +157,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state
--- a/tests/test-exchange-B6.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B6.t	Fri Aug 29 11:56:16 2014 +0200
@@ -74,11 +74,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -90,10 +87,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   ## post pull state
   # obstore: main
   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B7.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-B7.t	Fri Aug 29 11:56:16 2014 +0200
@@ -66,11 +66,7 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   ## post push state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -79,9 +75,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
+  pull obsolescence markers
   ## post pull state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C1.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-C1.t	Fri Aug 29 11:56:16 2014 +0200
@@ -69,11 +69,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 2 obsolescence markers (177 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (177 bytes)
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -85,10 +82,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (177 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -114,11 +109,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 2 obsolescence markers (177 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (177 bytes)
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -131,10 +123,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (177 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C2.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-C2.t	Fri Aug 29 11:56:16 2014 +0200
@@ -76,14 +76,11 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -99,10 +96,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -129,14 +124,11 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -152,10 +144,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-C3.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-C3.t	Fri Aug 29 11:56:16 2014 +0200
@@ -82,11 +82,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 3 obsolescence markers (241 bytes)
-  OBSEXC: DONE
+  pushing 3 obsolescence markers (241 bytes)
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -100,10 +97,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (241 bytes)
-  OBSEXC: 3 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  3 obsolescence markers added
   ## post pull state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -133,11 +128,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 3 obsolescence markers (241 bytes)
-  OBSEXC: DONE
+  pushing 3 obsolescence markers (241 bytes)
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -152,10 +144,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (241 bytes)
-  OBSEXC: 3 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  3 obsolescence markers added
   ## post pull state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C4.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-C4.t	Fri Aug 29 11:56:16 2014 +0200
@@ -89,11 +89,8 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -106,10 +103,8 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D1.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-D1.t	Fri Aug 29 11:56:16 2014 +0200
@@ -70,14 +70,11 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -93,10 +90,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-D2.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-D2.t	Fri Aug 29 11:56:16 2014 +0200
@@ -66,11 +66,8 @@
   ## pushing from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: pushing 2 obsolescence markers (153 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (153 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -83,10 +80,8 @@
   pulling from main
   searching for changes
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (153 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D3.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-D3.t	Fri Aug 29 11:56:16 2014 +0200
@@ -71,11 +71,7 @@
   ## pushing "O" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 1 nodes
   no changes found
-  OBSEXC: no marker to push
-  OBSEXC: DONE
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -85,9 +81,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  OBSEXC: pull obsolescence markers
-  OBSEXC: no unknown remote markers
-  OBSEXC: DONE
+  pull obsolescence markers
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D4.t	Wed Aug 27 18:28:09 2014 +0200
+++ b/tests/test-exchange-D4.t	Fri Aug 29 11:56:16 2014 +0200
@@ -85,14 +85,11 @@
   ## pushing "A1" from main to pushdest
   pushing to pushdest
   searching for changes
-  OBSEXC: computing relevant nodes
-  OBSEXC: computing markers relevant to 2 nodes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pushing 2 obsolescence markers (129 bytes)
-  OBSEXC: DONE
+  pushing 2 obsolescence markers (129 bytes)
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,10 +107,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  OBSEXC: pull obsolescence markers
-  OBSEXC: merging obsolescence markers (129 bytes)
-  OBSEXC: 2 obsolescence markers added
-  OBSEXC: DONE
+  pull obsolescence markers
+  2 obsolescence markers added
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main