--- a/docs/from-mq.rst Wed May 09 13:08:46 2012 +0200
+++ b/docs/from-mq.rst Wed May 09 14:24:56 2012 +0200
@@ -5,23 +5,21 @@
Cheat sheet
-------------
-::
-
- ============================== ============================================
- mq command new equivalent
- ============================== ============================================
+============================== ============================================
+mq command new equivalent
+============================== ============================================
- qseries ``log``
- qnew ``commit``
- qrefresh ``amend``
- qpop ``update`` or ``qdown``
- qpush ``update`` or ``gup`` sometimes ``stabilize``
- qrm ``kill``
- qfold ``amend -c`` (for now, ``collapse`` soon)
- qdiff ``odiff``
+qseries ``log``
+qnew ``commit``
+qrefresh ``amend``
+qpop ``update`` or ``qdown``
+qpush ``update`` or ``gup`` sometimes ``stabilize``
+qrm ``kill``
+qfold ``amend -c`` (for now, ``collapse`` soon)
+qdiff ``odiff``
- qfinish --
- qimport --
+qfinish --
+qimport --
Replacement details
@@ -34,7 +32,9 @@
You can use the standard log to display them. You can use the phase revset to
display unfinished business only and templates to have the same kind of compact
-output qseries has.::
+output qseries has.
+
+This will result in something like that::
[alias]
wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n'
@@ -42,7 +42,7 @@
hg qnew
````````
-With evolve you handle standard changesets without additional overlay.
+With evolve you handle standard changesets without an additional overlay.
Standard changeset are created using hg commit as usual.::
@@ -63,8 +63,8 @@
hg qref
````````
-A dedicated command from evolve will allow you to rewrite the changeset you are
-currently on.::
+A new command from evolution will allow you to rewrite the changeset you are
+currently on. just call:
$ hg amend
@@ -80,19 +80,16 @@
$ hg record babar.py
$ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A'
-.. warning:: `hg commit --amend` from Mercurial 2.2 does not lay obsolet marker yet and should
- **not** be used.
-
note: refresh is an alias for amend
hg qpop
`````````
-the following command emulate the behavior of hg qpop:
+the following command emule the behavior of hg qpop:
$ hg gdown
-If you need to go back to an arbitrary commit you can just use:
+If you need to go back to an arbitrary commit you can just us:
$ hg update
@@ -103,10 +100,10 @@
````````
When you rewrite changesets, descendants of rewritten changesets are marked as
-"unstable". You need to rewrite them on top of the new version of their
+"out of sync". You need to rewrite them on top of the new version of their
ancestor.
-The evolution extension adds a command to rewrite "unstable" changesets::
+The evolution extension adds a command to rewrite the "out of sync" changesets:::
$ hg stabilize
@@ -125,7 +122,7 @@
hg qrm
```````
-evolution introduce a new command to mark a changeset as "obsolete".::
+evolution introduce a new command to mark a changeset as "not wanted anymore".::
$ hg kill <revset>
@@ -135,8 +132,8 @@
::
- $ hg up <top-most-changeset>
- $ amend --edit -c <bottom-most-changeset>
+ $ hg up <top changeset>
+ $ amend --edit -c <bottom changeset>
or later::
@@ -155,7 +152,7 @@
hg qfinish and hg qimport
````````````````````````````
-Are not necessary anymore. If you want to control exchange and mutability of
+Is not necessary anymore. If you want to control exchange and mutability of
changesets, see the phase feature