--- a/tests/test-tutorial.t Thu Jun 25 16:55:27 2015 -0700
+++ b/tests/test-tutorial.t Thu Jun 25 17:22:17 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,27 +738,23 @@
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
$ cd ../remote
$ hg pull local # we up again to trigger the warning. it was displayed during the push
- pulling from $TESTTMP/local (glob)
+ pulling from $TESTTMP/local
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)
now let's see where we are, and update to the successor
$ hg parents
bf1b0d202029 (draft): animals
- working directory parent is obsolete!
- (use "hg evolve" to update to its successor)
$ hg evolve
update:[8] animals
1 files updated, 0 files merged, 0 files removed, 0 files unresolved