--- a/docs/from-mq.rst Wed May 09 12:43:45 2012 +0200
+++ b/docs/from-mq.rst Wed May 09 13:08:46 2012 +0200
@@ -5,21 +5,23 @@
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
@@ -32,9 +34,7 @@
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.
-
-This will result in something like that::
+output qseries has.::
[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 an additional overlay.
+With evolve you handle standard changesets without additional overlay.
Standard changeset are created using hg commit as usual.::
@@ -63,8 +63,8 @@
hg qref
````````
-A new command from evolution will allow you to rewrite the changeset you are
-currently on. just call:
+A dedicated command from evolve will allow you to rewrite the changeset you are
+currently on.::
$ hg amend
@@ -80,16 +80,19 @@
$ 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 emule the behavior of hg qpop:
+the following command emulate the behavior of hg qpop:
$ hg gdown
-If you need to go back to an arbitrary commit you can just us:
+If you need to go back to an arbitrary commit you can just use:
$ hg update
@@ -100,10 +103,10 @@
````````
When you rewrite changesets, descendants of rewritten changesets are marked as
-"out of sync". You need to rewrite them on top of the new version of their
+"unstable". You need to rewrite them on top of the new version of their
ancestor.
-The evolution extension adds a command to rewrite the "out of sync" changesets:::
+The evolution extension adds a command to rewrite "unstable" changesets::
$ hg stabilize
@@ -122,7 +125,7 @@
hg qrm
```````
-evolution introduce a new command to mark a changeset as "not wanted anymore".::
+evolution introduce a new command to mark a changeset as "obsolete".::
$ hg kill <revset>
@@ -132,8 +135,8 @@
::
- $ hg up <top changeset>
- $ amend --edit -c <bottom changeset>
+ $ hg up <top-most-changeset>
+ $ amend --edit -c <bottom-most-changeset>
or later::
@@ -152,7 +155,7 @@
hg qfinish and hg qimport
````````````````````````````
-Is not necessary anymore. If you want to control exchange and mutability of
+Are not necessary anymore. If you want to control exchange and mutability of
changesets, see the phase feature