hgbook
diff en/appB-mq-ref.xml @ 701:477d6a3e5023
Many final changes.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon May 04 23:52:38 2009 -0700 (2009-05-04) |
parents | b338f5490029 |
children | 18131160f7ee |
line diff
1.1 --- a/en/appB-mq-ref.xml Thu Apr 09 22:52:16 2009 -0700 1.2 +++ b/en/appB-mq-ref.xml Mon May 04 23:52:38 2009 -0700 1.3 @@ -72,6 +72,16 @@ 1.4 1.5 </sect2> 1.6 <sect2> 1.7 + <title><command role="hg-ext-mq">qfold</command>&emdash;move 1.8 + applied patches into repository history</title> 1.9 + 1.10 + <para>The <command>hg qfinish</command> command converts the 1.11 + specified applied patches into permanent changes by moving 1.12 + them out of MQ's control so that they will be treated as 1.13 + normal repository history.</para> 1.14 + </sect2> 1.15 + 1.16 + <sect2> 1.17 <title><command role="hg-ext-mq">qfold</command>&emdash;merge 1.18 (<quote>fold</quote>) several patches into one</title> 1.19 1.20 @@ -328,8 +338,8 @@ 1.21 no such text, a default commit message is used that 1.22 identifies the name of the patch.</para> 1.23 </listitem></itemizedlist> 1.24 - <para id="x_615">If a patch contains a Mercurial patch header (XXX add 1.25 - link), the information in the patch header overrides these 1.26 + <para id="x_615">If a patch contains a Mercurial patch header, 1.27 + the information in the patch header overrides these 1.28 defaults.</para> 1.29 1.30 <para id="x_616">Options:</para> 1.31 @@ -435,21 +445,6 @@ 1.32 1.33 </sect2> 1.34 <sect2> 1.35 - <title><command 1.36 - role="hg-ext-mq">qrestore</command>&emdash;restore saved 1.37 - queue state</title> 1.38 - 1.39 - <para id="x_628">XXX No idea what this does.</para> 1.40 - 1.41 - </sect2> 1.42 - <sect2> 1.43 - <title><command role="hg-ext-mq">qsave</command>&emdash;save 1.44 - current queue state</title> 1.45 - 1.46 - <para id="x_629">XXX Likewise.</para> 1.47 - 1.48 - </sect2> 1.49 - <sect2> 1.50 <title><command role="hg-ext-mq">qseries</command>&emdash;print 1.51 the entire patch series</title> 1.52 1.53 @@ -501,9 +496,7 @@ 1.54 changesets in the backup bundle.</para> 1.55 </listitem> 1.56 <listitem><para id="x_631"><option role="hg-opt-strip">-f</option>: If a 1.57 - branch has multiple heads, remove all heads. XXX This 1.58 - should be renamed, and use <literal>-f</literal> to strip 1.59 - revs when there are pending changes.</para> 1.60 + branch has multiple heads, remove all heads.</para> 1.61 </listitem> 1.62 <listitem><para id="x_632"><option role="hg-opt-strip">-n</option>: Do 1.63 not save a backup bundle.</para>