diff tests/test-tutorial.t @ 2929:06844693bb21

tests: update after removing of redundant amend commit

Following e8a7c1a0565a, temporary amend commits has been removed impacting all
revision numbers in tests including amend operations.

Update tests case to use description or hashes when possible and update
revisions number when not.

--- a/tests/test-tutorial.t	Wed Sep 13 15:13:51 2017 +0200
+++ b/tests/test-tutorial.t	Fri Sep 15 15:48:18 2017 +0200
@@ -245,7 +245,7 @@
   $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
   rebasing 1:4d5dc8187023 "adding condiment"
   merging shopping
-  rebasing 4:9d0363b81950 "adding fruit"
+  rebasing 3:9d0363b81950 "adding fruit"
   merging shopping
 
 
@@ -350,7 +350,7 @@
   $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
-  rebasing 10:fac207dec9f5 "SPAM SPAM" (tip)
+  rebasing 9:fac207dec9f5 "SPAM SPAM" (tip)
   merging shopping
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg log -G
@@ -406,12 +406,12 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
-  6 new obsolescence markers
+  5 new obsolescence markers
 
 for simplicity sake we get the bathroom change in line again
 
   $ hg grab 10b8aeaa8cc8
-  rebasing 9:10b8aeaa8cc8 "bathroom stuff"
+  rebasing 8:10b8aeaa8cc8 "bathroom stuff"
   merging shopping
   ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
   $ hg phase --draft .
@@ -648,8 +648,8 @@
   adding changesets
   adding manifests
   adding file changes
-  added 1 changesets with 1 changes to 1 files (+1 heads)
-  (run 'hg heads' to see heads, 'hg merge' to merge)
+  added 1 changesets with 1 changes to 1 files
+  (run 'hg update' to get a working copy)
   1 new orphan changesets
 
 
@@ -696,15 +696,15 @@
 It has a --dry-run option to only suggest the next move.
 
   $ hg evolve --dry-run
-  move:[15] animals
-  atop:[14] bathroom stuff
+  move:[13] animals
+  atop:[12] bathroom stuff
   hg rebase -r bf1b0d202029 -d a44c85f957d3
 
 Let's do it
 
   $ hg evolve
-  move:[15] animals
-  atop:[14] bathroom stuff
+  move:[13] animals
+  atop:[12] bathroom stuff
   merging shopping
   working directory is now at ee942144f952
 
@@ -735,7 +735,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
-  3 new obsolescence markers
+  2 new obsolescence markers
   obsoleted 2 changesets
 
 Remote get a warning that current working directory is based on an obsolete
@@ -830,8 +830,8 @@
   99f039c5ec9e (draft): SPAM SPAM SPAM
 
   $ hg evolve
-  move:[17] SPAM SPAM SPAM
-  atop:[14] bathroom stuff
+  move:[15] SPAM SPAM SPAM
+  atop:[12] bathroom stuff
   merging shopping
   working directory is now at 40aa40daeefb