--- a/tests/test-tutorial.t Tue Jul 25 20:16:33 2017 +0200
+++ b/tests/test-tutorial.t Mon Jul 24 16:44:37 2017 +0200
@@ -158,7 +158,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
+Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
$ sed -i'' -e s/Bananos/Banana/ shopping
$ hg diff
@@ -207,7 +207,7 @@
Getting rid of branchy history
----------------------------------
-While I was working on my list. someone made a change remotely.
+While I was working on my list. Someone made a change remotely.
$ cd ../remote
$ hg up -q
@@ -226,7 +226,7 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
-I now have a new heads. Note that this remote head is immutable
+I now have a new head. Note that this remote head is immutable.
$ hg log -G
o 9ca060c80d74 (public): SPAM
@@ -238,7 +238,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-instead of merging my head with the new one. I'm going to rebase my work
+Instead of merging my head with the new one. I'm going to rebase my work
$ hg diff
$ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
@@ -263,7 +263,7 @@
Removing changesets
------------------------
-I add new item to my list
+I add new items to my list.
$ cat >> shopping << EOF
> car
@@ -284,7 +284,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-I have a new commit but I realize that don't want it. (transport shop list does
+I have a new commit but I realize that don't want it. (Transport shop list does
not fit well in my standard shopping list)
$ hg prune . # "." is for working directory parent
@@ -513,7 +513,7 @@
-----------------------
-sharing mutable changesets
+Sharing mutable changesets
----------------------------
To share mutable changesets with others, just check that the repo you interact
@@ -524,7 +524,7 @@
$ hg -R ../local/ showconfig phases
[1]
-the localrepo does not have any specific configuration for `phases.publish`. It
+The localrepo does not have any specific configuration for `phases.publish`. It
is ``true`` by default.
$ hg pull local
@@ -550,8 +550,6 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
We do not want to publish the "bathroom changeset". Let's rollback the last transaction.
.. Warning: Rollback is actually a dangerous kind of internal command that is deprecated and should not be exposed to user. Please forget you read about it until someone fix this tutorial.
@@ -570,7 +568,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-Let's make the local repo "non publishing"
+Let's make the local repo "non publishing".
$ echo '[phases]' >> ../local/.hg/hgrc
$ echo 'publish=false' >> ../local/.hg/hgrc
@@ -641,7 +639,6 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
When we pull from remote again we get an unstable state!
$ hg pull remote
@@ -692,8 +689,6 @@
[255]
-
-
To resolve this unstable state, you need to rebase bf1b0d202029 onto
a44c85f957d3. The `hg evolve` command will do this for you.
@@ -730,8 +725,7 @@
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-We can push this evolution to remote
+We can push this evolution to remote.
$ hg push remote
pushing to $TESTTMP/remote (glob)
@@ -743,7 +737,8 @@
3 new obsolescence markers
obsoleted 2 changesets
-remote get a warning that current working directory is based on an obsolete changeset
+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
@@ -753,7 +748,7 @@
working directory parent is obsolete! (bf1b0d202029)
(use 'hg evolve' to update to its successor: ee942144f952)
-now let's see where we are, and update to the successor
+Now let's see where we are, and update to the successor.
$ hg parents
bf1b0d202029 (draft): animals
@@ -767,7 +762,7 @@
Relocating unstable change after prune
----------------------------------------------
-The remote guy keep working
+The remote guy keeps working.
$ sed -i'' -e 's/Spam/Spam Spam Spam Spam/g' shopping
$ hg commit -m "SPAM SPAM SPAM"
@@ -811,7 +806,7 @@
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
-is neither dead or obsolete. My repository is in an unstable state again.
+is neither dead or obsolete. My repository is in an unstable state again.
$ hg log -G
o 99f039c5ec9e (draft): SPAM SPAM SPAM
@@ -830,7 +825,6 @@
|
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
$ hg log -r 'unstable()'
99f039c5ec9e (draft): SPAM SPAM SPAM
@@ -855,8 +849,6 @@
|
o 7e82d3f3c2cb (public): Monthy Python Shopping list
-
-
Handling Divergent amend
----------------------------------------------