tests/test-wireproto-bundle1.t
branchmercurial-3.4
changeset 1607 3c7f98753e37
parent 1453 8ca31deb8db7
child 1608 e359d33856c3
--- a/tests/test-wireproto-bundle1.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-wireproto-bundle1.t	Thu Feb 04 11:01:35 2016 +0000
@@ -50,6 +50,7 @@
   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
@@ -69,7 +70,8 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  remote: 2 new obsolescence markers
+  pushing 2 obsolescence markers (18? bytes) (glob)
+  remote: 2 obsolescence markers added
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
@@ -86,8 +88,9 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
-  2 new obsolescence markers
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  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