tests/test-tutorial.t
branchmercurial-3.4
changeset 1607 3c7f98753e37
parent 1470 c3f6e97c71b1
child 1700 05d7df73a56b
--- a/tests/test-tutorial.t	Thu Feb 04 10:24:26 2016 +0000
+++ b/tests/test-tutorial.t	Thu Feb 04 11:01:35 2016 +0000
@@ -224,6 +224,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 I now have a new heads. Note that this remote head is immutable
@@ -405,7 +406,8 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  6 new obsolescence markers
+  pushing 6 obsolescence markers (52? bytes) (glob)
+  6 obsolescence markers added
 
 for simplicity sake we get the bathroom change in line again
 
@@ -525,7 +527,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new obsolescence markers
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (public): bathroom stuff
@@ -582,7 +585,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  1 new obsolescence markers
+  pull obsolescence markers
+  1 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  75954b8cd933 (draft): bathroom stuff
@@ -642,6 +646,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pull obsolescence markers
+  0 obsolescence markers added
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
 
@@ -731,7 +737,8 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  3 new obsolescence markers
+  pushing 10 obsolescence markers (87? bytes) (glob)
+  3 obsolescence markers added
 
 remote get a warning that current working directory is based on an obsolete changeset
 
@@ -740,6 +747,8 @@
   pulling from $TESTTMP/local (glob)
   searching for changes
   no changes found
+  pull obsolescence markers
+  0 obsolescence markers added
   working directory parent is obsolete!
   (use "hg evolve" to update to its successor)
 
@@ -772,6 +781,8 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pull obsolescence markers
+  0 obsolescence markers added
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  99f039c5ec9e (draft): SPAM SPAM SPAM