Mercurial > evolve
changeset 654:c56109c9aebf
tutorial: fix grammar, spelling, punctuation
I restrained myself to making only changes that turn bad English into
good English. There are still opportunities to improve the tutorial,
but other changes require some discussion and review. This change
should be uncontroversial.
The same changes had to be duplicated in both copies of the tutorial
(hmmm); it's not clear which one is definitive.
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Thu, 24 Jan 2013 18:02:00 -0500 |
| parents | 116c6f76d24b |
| children | dd5765ae91c3 |
| files | docs/tutorials/tutorial.t tests/test-tutorial.t |
| diffstat | 2 files changed, 34 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- a/tests/test-tutorial.t Fri Dec 07 12:14:46 2012 +0100 +++ b/tests/test-tutorial.t Thu Jan 24 18:02:00 2013 -0500 @@ -40,7 +40,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: @@ -143,9 +143,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 log -G @ d85de4546133 (draft): adding fruit @@ -200,7 +199,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. @@ -254,7 +253,7 @@ o 7e82d3f3c2cb (public): Monthy Python Shopping list -Removing changeset +Removing changesets ------------------------ I add new item to my list @@ -297,7 +296,7 @@ o 7e82d3f3c2cb (public): Monthy Python Shopping list -Reordering changeset +Reordering changesets ------------------------ @@ -331,8 +330,8 @@ .. note: We can'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: @@ -437,7 +436,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. @@ -572,7 +571,7 @@ 1 new unstable 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 @@ -594,11 +593,11 @@ The older version 75954b8cd933 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 a44c85f957d3 as a new version of 75954b8cd933. this is not yet ported to graphlog. +.. note:: In hgview there is a nice dotted relation highlighting a44c85f957d3 as a new version of 75954b8cd933. 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 @@ -612,7 +611,7 @@ To resolve this unstable state, you need to rebase bf1b0d202029 onto -a44c85f957d3 the "hg evolve" command will make this for you. +a44c85f957d3. The "hg evolve" command will do this for you. It has a --dry-run option to only suggest the next move. @@ -763,7 +762,7 @@ Handling Conflicting amend ---------------------------------------------- -We can detect that multiple diverging//conflicting amend have been made. -hg evolve is able to solve several of them +We can detect that multiple diverging/conflicting amendments have been made. There +will be a "evol-merge" command to merge conflicting amendments. -This section need to be written +This section needs to be written.