hgbook

changeset 689:f3f901cfbfc7

Describe the qfinish command in preference to qdelete -r.
author Bryan O'Sullivan <bos@serpentine.com>
date Fri Apr 24 17:00:00 2009 -0700 (2009-04-24)
parents 6b7818eb3d8e
children 2c266a253b44
files en/ch11-mq.xml en/examples/ch11/qdelete
line diff
     1.1 --- a/en/ch11-mq.xml	Fri Apr 24 00:31:21 2009 -0700
     1.2 +++ b/en/ch11-mq.xml	Fri Apr 24 17:00:00 2009 -0700
     1.3 @@ -197,7 +197,7 @@
     1.4        file.  Take a look below for a simple example of these commands
     1.5        in action.</para>
     1.6  
     1.7 -&interaction.mq.dodiff.diff;
     1.8 +      &interaction.mq.dodiff.diff;
     1.9  
    1.10      <para id="x_3c4">The type of file that <command>diff</command> generates (and
    1.11        <command>patch</command> takes as input) is called a
    1.12 @@ -766,15 +766,19 @@
    1.13      <sect2>
    1.14        <title>Converting to and from permanent revisions</title>
    1.15  
    1.16 -      <para id="x_6dd">Once you're done working on a patch and want to turn it
    1.17 -	into a permanent changeset, use the <command
    1.18 -	  role="hg-ext-mq">hg qdelete -r</command> command.  Pass a
    1.19 -	revision to the <option>-r</option> option to identify the
    1.20 -	patch that you want to turn into a regular changeset; this
    1.21 -	patch must already be applied.</para>
    1.22 +      <para id="x_6dd">Once you're done working on a patch and want to
    1.23 +      turn it into a permanent changeset, use the <command
    1.24 +      role="hg-ext-mq">hg qfinish</command> command. Pass a revision
    1.25 +      to the command to identify the patch that you want to turn into
    1.26 +      a regular changeset; this patch must already be applied.</para>
    1.27  
    1.28        &interaction.ch11-qdelete.convert;
    1.29  
    1.30 +      <para id="x_6e0">The <command role="hg-ext-mq">hg qfinish</command> command
    1.31 +        accepts an <option>--all</option> or <option>-a</option>
    1.32 +        option, which turns all applied patches into regular
    1.33 +        changesets.</para>
    1.34 +
    1.35        <para id="x_6de">It is also possible to turn an existing changeset into a
    1.36  	patch, by passing the <option>-r</option> option to <command
    1.37  	  role="hg-ext-mq">hg qimport</command>.</para>
     2.1 --- a/en/examples/ch11/qdelete	Fri Apr 24 00:31:21 2009 -0700
     2.2 +++ b/en/examples/ch11/qdelete	Fri Apr 24 17:00:00 2009 -0700
     2.3 @@ -22,7 +22,7 @@
     2.4  echo a > a
     2.5  hg add a
     2.6  hg qrefresh -m 'Good change'
     2.7 -hg qdelete -r tip
     2.8 +hg qfinish tip
     2.9  hg qapplied
    2.10  hg tip --style=compact
    2.11