Mercurial > evolve
changeset 179:bc6460f61c64
docs: fix typos in the FAQ
| author | Arne Babenhauserheide <bab@draketo.de> |
|---|---|
| date | Tue, 27 Mar 2012 19:41:52 +0200 |
| parents | 3f18a6580d14 |
| children | 4379ffd6d293 |
| files | docs/evolve-faq.rst |
| diffstat | 1 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Tue Mar 27 19:18:44 2012 +0200 +++ b/docs/evolve-faq.rst Tue Mar 27 19:41:52 2012 +0200 @@ -8,7 +8,7 @@ Add a changeset: ``commit`` ------------------------------------------------------------ -Just use commit as usual. New changeset will be in the `draft` phase. +Just use commit as usual. New changesets will be in the `draft` phase. Rewrite a changeset: ``amend`` ------------------------------------------------------------ @@ -65,13 +65,13 @@ .. [#] add this `-O` to graft instead of a dedicated command is probably - abusive. But this was very convenient for experimental purpose. + abusive. But this was very convenient for experimental purposes. This will likely change in non experimental release. Delete a changeset: ``kill`` ------------------------------------------------------------ -A new ``kill`` command allows to remove a changeset. +A new ``kill`` command allows removing a changeset. Just use ``hg kill <some-rev>``. @@ -88,7 +88,7 @@ .. note:: those command only exist for the convenience of getting qpush and qpop feeling back. -collapse changesets: ``amend`` +Collapse changesets: ``amend`` ------------------------------------------------------------ you can use amend -c to collapse multiple changeset in a single one. @@ -96,10 +96,10 @@ Move multiple changesets: ``rebase`` ------------------------------------------------------------ -You can still use rebase to move whole part of the changeset graph at once. +You can still use rebase to move a whole segment of the changeset graph together. -.. warning:: Beware that rebasing obsolete changeset will result in new - conflicting version. +.. warning:: Beware that rebasing obsolete changesets will result in + conflicting versions of the changesets. Stabilize history: ``stabilize`` ------------------------------------------------------------ @@ -108,7 +108,7 @@ those children you create *unstable* changesets and *suspended obsolete* changesets. -When you are finished amending a given changeset you will want to +When you are finished amending a given changeset, you will want to declare it stable, in other words rebase its former descendants on its newest version. This is not done automatically to avoid the proliferation of useless hidden changesets. @@ -118,8 +118,8 @@ .. warning:: stabilization does not handle deletion yet. -.. warning:: obsolete currently rely on secret changeset to not exchange - obsolete and unstable changeset. +.. warning:: obsolete currently relies on changesets in secret phase + to avoid exchanging obsolete and unstable changesets. XXX details issue here @@ -128,7 +128,7 @@ ------------------------------------------------------------ Sometimes you need to create an obsolete marker by hand. This may happen when -upstream has applied some of you patches for example. +upstream has applied some of your patches for example. you can use ``hg kill --new <new-changeset> <old-changeset>`` to add obsolete marker.