Mercurial > hgbook
changeset 813:f3f901cfbfc7
Describe the qfinish command in preference to qdelete -r.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri, 24 Apr 2009 17:00:00 -0700 |
| parents | 6b7818eb3d8e |
| children | 2c266a253b44 |
| files | en/ch11-mq.xml en/examples/ch11/qdelete |
| diffstat | 2 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/en/ch11-mq.xml Fri Apr 24 00:31:21 2009 -0700 +++ b/en/ch11-mq.xml Fri Apr 24 17:00:00 2009 -0700 @@ -197,7 +197,7 @@ file. Take a look below for a simple example of these commands in action.</para> -&interaction.mq.dodiff.diff; + &interaction.mq.dodiff.diff; <para id="x_3c4">The type of file that <command>diff</command> generates (and <command>patch</command> takes as input) is called a @@ -766,15 +766,19 @@ <sect2> <title>Converting to and from permanent revisions</title> - <para id="x_6dd">Once you're done working on a patch and want to turn it - into a permanent changeset, use the <command - role="hg-ext-mq">hg qdelete -r</command> command. Pass a - revision to the <option>-r</option> option to identify the - patch that you want to turn into a regular changeset; this - patch must already be applied.</para> + <para id="x_6dd">Once you're done working on a patch and want to + turn it into a permanent changeset, use the <command + role="hg-ext-mq">hg qfinish</command> command. Pass a revision + to the command to identify the patch that you want to turn into + a regular changeset; this patch must already be applied.</para> &interaction.ch11-qdelete.convert; + <para id="x_6e0">The <command role="hg-ext-mq">hg qfinish</command> command + accepts an <option>--all</option> or <option>-a</option> + option, which turns all applied patches into regular + changesets.</para> + <para id="x_6de">It is also possible to turn an existing changeset into a patch, by passing the <option>-r</option> option to <command role="hg-ext-mq">hg qimport</command>.</para>