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

merge back with 3.3 compat branch
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 25 Jun 2015 17:37:43 -0700
parents 73eb4f33f9dc
children 8ca31deb8db7 71a3aa0349c5
line wrap: on
line diff
--- a/tests/test-tutorial.t	Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-tutorial.t	Thu Jun 25 17:37:43 2015 -0700
@@ -406,7 +406,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  pushing 6 obsolescence markers (529 bytes)
+  pushing 6 obsolescence markers (*) (glob)
   6 obsolescence markers added
 
 for simplicity sake we get the bathroom change in line again
@@ -738,7 +738,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  pushing 10 obsolescence markers (873 bytes)
+  pushing 10 obsolescence markers (*) (glob)
   3 obsolescence markers added
 
 remote get a warning that current working directory is based on an obsolete changeset