Mercurial > evolve
changeset 181:35baa2a80073
docs: fix typos in evolve collaboration.
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Tue, 27 Mar 2012 19:46:54 +0200 |
| parents | 4379ffd6d293 |
| children | 33b9cb1ce659 |
| files | docs/evolve-collaboration.rst |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-collaboration.rst Tue Mar 27 19:42:09 2012 +0200 +++ b/docs/evolve-collaboration.rst Tue Mar 27 19:46:54 2012 +0200 @@ -7,7 +7,7 @@ After having written some code for ticket #42, M W. start a patch (this will be kind of like a 'work-in-progress' checkpoint initially):: - $ ci -m '[entities] remove magic' + $ hg ci -m '[entities] remove magic' Instant patch ! Note how the default phase of this changeset is (still) in "draft" state. @@ -27,7 +27,7 @@ "publishing" since they do not have the notion of non-public changesets (or mutable history). -In the transition ... phase from older mercurial servers, this will +During the transition from older mercurial servers to new ones, this will happen often, so be careful. Now let's come back to our patch. Next hour sees good progress and W. @@ -44,7 +44,7 @@ $ hg push # was done with a modern mercurial, draft phase is preserved -The next day, Mr C.W, which arrives very very early, can immediately +The next day, Mr C.W., who arrives very early, can immediately work out some glitches in the patch. He then starts another one, for ticket #43 and finally commits it.