Mercurial > evolve
changeset 768:b116de5dc70d stable
tutorial: fix some various typo
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 09 Jan 2014 21:22:41 -0800 |
| parents | 01a270481a61 |
| children | e2a463e1e7c8 |
| files | tests/test-tutorial.t |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-tutorial.t Thu Jan 09 21:38:28 2014 -0800 +++ b/tests/test-tutorial.t Thu Jan 09 21:22:41 2014 -0800 @@ -207,7 +207,7 @@ Getting rid of branchy history ---------------------------------- -While I was working on my list. someone help made a change remotly. +While I was working on my list. someone made a change remotly. $ cd ../remote $ hg up -q @@ -336,9 +336,9 @@ .. note: We can't amend changeset 7e82d3f3c2cb or 9ca060c80d74 as they are immutable. -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" + 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 'grab' for that: @@ -402,7 +402,7 @@ adding file changes added 3 changesets with 3 changes to 1 files -for simplicity shake we get the bathroom change in line again +for simplicity sake we get the bathroom change in line again $ hg rebase -r 10b8aeaa8cc8 -d a224f2a4fb9f merging shopping @@ -489,10 +489,10 @@ ----------------------- -sharing mutable changeset +sharing mutable changesets ---------------------------- -To share mutable changeset with others, just check that the repo you interact +To share mutable changesets 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. @@ -667,7 +667,7 @@ To resolve this unstable state, you need to rebase bf1b0d202029 onto -a44c85f957d3. The "hg evolve" command will do 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.