Mercurial > hgbook

comparison en/ch11-mq.xml @ 813:f3f901cfbfc7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 a66f6d499afa
children
comparison
equal deleted inserted replaced
812:6b7818eb3d8e 813:f3f901cfbfc7
195 them. The <command>patch</command> command understands these 195 them. The <command>patch</command> command understands these
196 differences as <emphasis>modifications</emphasis> to make to a 196 differences as <emphasis>modifications</emphasis> to make to a
197 file. Take a look below for a simple example of these commands 197 file. Take a look below for a simple example of these commands
198 in action.</para> 198 in action.</para>
199 199
200 &interaction.mq.dodiff.diff; 200 &interaction.mq.dodiff.diff;
201 201
202 <para id="x_3c4">The type of file that <command>diff</command> generates (and 202 <para id="x_3c4">The type of file that <command>diff</command> generates (and
203 <command>patch</command> takes as input) is called a 203 <command>patch</command> takes as input) is called a
204 <quote>patch</quote> or a <quote>diff</quote>; there is no 204 <quote>patch</quote> or a <quote>diff</quote>; there is no
205 difference between a patch and a diff. (We'll use the term 205 difference between a patch and a diff. (We'll use the term
764 </sect2> 764 </sect2>
765 765
766 <sect2> 766 <sect2>
767 <title>Converting to and from permanent revisions</title> 767 <title>Converting to and from permanent revisions</title>
768 768
769 <para id="x_6dd">Once you're done working on a patch and want to turn it 769 <para id="x_6dd">Once you're done working on a patch and want to
770 into a permanent changeset, use the <command 770 turn it into a permanent changeset, use the <command
771 role="hg-ext-mq">hg qdelete -r</command> command. Pass a 771 role="hg-ext-mq">hg qfinish</command> command. Pass a revision
772 revision to the <option>-r</option> option to identify the 772 to the command to identify the patch that you want to turn into
773 patch that you want to turn into a regular changeset; this 773 a regular changeset; this patch must already be applied.</para>
774 patch must already be applied.</para>
775 774
776 &interaction.ch11-qdelete.convert; 775 &interaction.ch11-qdelete.convert;
776
777 <para id="x_6e0">The <command role="hg-ext-mq">hg qfinish</command> command
778 accepts an <option>--all</option> or <option>-a</option>
779 option, which turns all applied patches into regular
780 changesets.</para>
777 781
778 <para id="x_6de">It is also possible to turn an existing changeset into a 782 <para id="x_6de">It is also possible to turn an existing changeset into a
779 patch, by passing the <option>-r</option> option to <command 783 patch, by passing the <option>-r</option> option to <command
780 role="hg-ext-mq">hg qimport</command>.</para> 784 role="hg-ext-mq">hg qimport</command>.</para>
781 785