diff -r 783aa685c5d4 -r 18a18131e92f tests/test-wireproto.t --- a/tests/test-wireproto.t Mon Apr 20 14:45:50 2015 +0200 +++ b/tests/test-wireproto.t Tue Apr 21 17:37:59 2015 +0200 @@ -2,6 +2,9 @@ $ cat >> $HGRCPATH < [defaults] > amend=-d "0 0" + > [experimental] + > obsmarkers-exchange-debug=true + > bundle2-exp=true > [ui] > ssh=python "$TESTDIR/dummyssh" > [phases] @@ -50,7 +53,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 2 files - pull obsolescence markers (run 'hg update' to get a working copy) $ hg push -R ../other pushing to ssh://user@dummy/server @@ -70,8 +72,8 @@ remote: adding manifests remote: adding file changes remote: added 1 changesets with 1 changes to 1 files (+1 heads) - pushing 2 obsolescence markers (* bytes) (glob) - remote: 2 obsolescence markers added + remote: obsmarker-exchange: 139 bytes received + remote: 2 new obsolescence markers $ hg push pushing to ssh://user@dummy/server searching for changes @@ -88,9 +90,9 @@ adding manifests adding file changes added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re) - pull obsolescence markers - 2 obsolescence markers added - (run 'hg heads' to see heads) + obsmarker-exchange: 139 bytes received + 2 new obsolescence markers + (run 'hg heads' to see heads, 'hg merge' to merge) $ hg -R ../other pull pulling from ssh://user@dummy/server searching for changes