tests/test-tutorial.t
branchmercurial-3.4
changeset 1800 1554b30b18eb
parent 1763 6d54fd20bb81
parent 1782 a046e78c3290
--- a/tests/test-tutorial.t	Wed Feb 01 15:51:02 2017 +0100
+++ b/tests/test-tutorial.t	Wed Feb 01 16:03:39 2017 +0100
@@ -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
 
@@ -526,7 +528,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
@@ -583,7 +586,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
@@ -643,6 +647,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
 
@@ -732,7 +738,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
 
@@ -741,6 +748,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)
 
@@ -773,6 +782,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