diff tests/test-obsolete.t @ 1452:1bcbd14cf159 stable

merge back with 3.3 compat branch

--- a/tests/test-obsolete.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-obsolete.t	Thu Jun 25 17:37:43 2015 -0700
@@ -184,7 +184,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
-  pushing 2 obsolescence markers (133 bytes)
+  pushing 2 obsolescence markers (*) (glob)
   2 obsolescence markers added
   $ hg -R ../other-new verify
   checking changesets
@@ -239,7 +239,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 3 obsolescence markers (199 bytes)
+  pushing 3 obsolescence markers (*) (glob)
   1 obsolescence markers added
   $ qlog -R ../other-new
   5
@@ -262,7 +262,7 @@
   pushing to ../other-new
   searching for changes
   no changes found
-  pushing 3 obsolescence markers (199 bytes)
+  pushing 3 obsolescence markers (*) (glob)
   0 obsolescence markers added
   [1]
 
@@ -544,7 +544,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
-  pushing 7 obsolescence markers (491 bytes)
+  pushing 7 obsolescence markers (*) (glob)
   3 obsolescence markers added
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
@@ -557,7 +557,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 8 obsolescence markers (557 bytes)
+  pushing 8 obsolescence markers (*) (glob)
   1 obsolescence markers added
   $ cd ..