tests/test-tutorial.t
branchstable
changeset 1450 5f6e78aea094
parent 1443 6c122c975125
child 1451 73eb4f33f9dc
--- a/tests/test-tutorial.t	Tue Jun 23 16:50:06 2015 -0700
+++ b/tests/test-tutorial.t	Thu Jun 25 16:55:27 2015 -0700
@@ -289,9 +289,9 @@
 not fit well in my standard shopping list)
 
   $ hg prune . # "." is for working directory parent
-  1 changesets pruned
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at 41aff6a42b75
+  1 changesets pruned
 
 The silly changeset is gone.
 
@@ -406,7 +406,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  pushing 6 obsolescence markers (* bytes) (glob)
+  pushing 6 obsolescence markers (529 bytes)
   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 (* bytes) (glob)
+  pushing 10 obsolescence markers (873 bytes)
   3 obsolescence markers added
 
 remote get a warning that current working directory is based on an obsolete changeset
@@ -751,12 +751,14 @@
   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
@@ -804,9 +806,9 @@
 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
 
   $ hg prune ee942144f952
-  1 changesets pruned
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory now at a44c85f957d3
+  1 changesets pruned
   1 new unstable changesets