Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docs/tutorials/tutorial.t
changeset 654 c56109c9aebf
parent 547 c4abb0218e84
child 764 4a74288c671c 
--- a/docs/tutorials/tutorial.t	Fri Dec 07 12:14:46 2012 +0100
+++ b/docs/tutorials/tutorial.t	Thu Jan 24 18:02:00 2013 -0500
@@ -42,7 +42,7 @@
   > EOF
 
 
-This tutorial use the following configuration for Mercurial:
+This tutorial uses the following configuration for Mercurial:
 
 A compact log template with phase data:
 
@@ -146,9 +146,8 @@
   +Pear
   +Apple
 
-The faulty changeset is in the "draft" phase because he was not exchanged with
-the outside. The first one have been exchanged and is an immutable public
-changeset.
+The faulty changeset is in the "draft" phase because it has not been exchanged with
+the outside. The first one has been exchanged and is "public" (immutable).
 
   $ hg glog
   @  d85de4546133 (draft): adding fruit
@@ -203,7 +202,7 @@
   +Pear
   +Apple
 
-Getting Ride of branchy history
+Getting rid of branchy history
 ----------------------------------
 
 While I was working on my list. someone help made a change remotly.
@@ -257,7 +256,7 @@
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
-Removing changeset
+Removing changesets
 ------------------------
 
 I add new item to my list
@@ -300,7 +299,7 @@
   o  7e82d3f3c2cb (public): Monthy Python Shopping list
   
 
-Reordering changeset
+Reordering changesets
 ------------------------
 
 
@@ -334,8 +333,8 @@
 
 .. note: don't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable.
 
-I now want to push to remote all my change but the bathroom one that i'm not
-totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" not children of
+I now want to push to remote all my changes except the bathroom one, which I'm not
+totally happy with yet. To be able to push "SPAM SPAM" I need a version of "SPAM SPAM" which is not a child of
 "bathroom stuff"
 
 You can use 'rebase -r' or 'graft -O' for that:
@@ -361,7 +360,7 @@
 
 We have a new SPAM SPAM version without the bathroom stuff
 
-  $ grep Spam shopping  # enouth spam
+  $ grep Spam shopping  # enough spam
   Spam Spam Spam Spam Spam Spam Spam Spam Spam
   $ grep Toothbrush shopping # no Toothbrush
   [1]
@@ -442,7 +441,7 @@
 sharing mutable changeset
 ----------------------------
 
-To share mutable changeset with other just check that the repo you interact
+To share mutable changeset with others, just check that the repo you interact
 with is "not publishing". Otherwise you will get the previously observe
 behavior where exchanged changeset are automatically published.
 
@@ -577,7 +576,7 @@
   1 new unstables changesets
 
 
-The new changeset "animal" is based one an old changeset of "bathroom". You can
+The new changeset "animal" is based on an old changeset of "bathroom". You can
 see both version showing up in the log.
 
   $ hg log -G
@@ -599,11 +598,11 @@
   
 
 The older version 8a79ae8b029e never ceased to exist in the local repo. It was
-jsut hidden and excluded from pull and push.
+just hidden and excluded from pull and push.
 
-.. note:: In hgview there is a nice doted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. this is not yet ported to graphlog.
+.. note:: In hgview there is a nice dotted relation highlighting ffa278c50818 as a new version of 8a79ae8b029e. This is not yet ported to ``hg log -G``.
 
-Their is **unstable** changeset in this history now. Mercurial will refuse to
+There is now an **unstable** changeset in this history. Mercurial will refuse to
 share it with the outside:
 
   $ hg push other
@@ -617,7 +616,7 @@
 
 
 To resolve this unstable state, you need to rebase 9ac5d0e790a2 onto
-ffa278c50818 the "hg stabilize" command will make this for you.
+ffa278c50818. The "hg stabilize" command will do this for you.
 
 It has a --dry-run option to only suggest the next move.
 
@@ -769,7 +768,7 @@
 Handling Conflicting amend
 ----------------------------------------------
 
-We can detect that multiple diverging//conflicting amend have been made. There
-will be a "evol-merge" command to merge conflicting amend
+We can detect that multiple diverging/conflicting amendments have been made. There
+will be a "evol-merge" command to merge conflicting amendments.
 
 This command is not ready yet.
evolve