--- a/tests/test-tutorial.t Wed Jun 03 16:01:28 2015 -0700
+++ b/tests/test-tutorial.t Thu Jun 04 13:26:58 2015 -0700
@@ -224,7 +224,6 @@
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
@@ -406,8 +405,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- pushing 6 obsolescence markers (* bytes) (glob)
- 6 obsolescence markers added
+ 6 new obsolescence markers
for simplicity sake we get the bathroom change in line again
@@ -528,8 +526,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- pull obsolescence markers
- 1 obsolescence markers added
+ 1 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (public): bathroom stuff
@@ -586,8 +583,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- pull obsolescence markers
- 1 obsolescence markers added
+ 1 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg log -G
o 75954b8cd933 (draft): bathroom stuff
@@ -647,8 +643,6 @@
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
@@ -738,8 +732,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- pushing 10 obsolescence markers (* bytes) (glob)
- 3 obsolescence markers added
+ 3 new obsolescence markers
remote get a warning that current working directory is based on an obsolete changeset
@@ -748,8 +741,6 @@
pulling from $TESTTMP/local (glob)
searching for changes
no changes found
- pull obsolescence markers
- 0 obsolescence markers added
working directory parent is obsolete!
now let's see where we are, and update to the successor
@@ -780,8 +771,6 @@
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