1.1 --- a/en/ch12-mq.xml	Wed Feb 18 00:22:09 2009 -0800
     1.2 +++ b/en/ch12-mq.xml	Mon Mar 09 23:22:09 2009 -0700
     1.3 @@ -196,7 +196,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>The type of file that <command>diff</command> generates (and
    1.11        <command>patch</command> takes as input) is called a
    1.12 @@ -263,14 +263,14 @@
    1.13        the <command role="hg-ext-mq">qinit</command> command is now
    1.14        available.</para>
    1.15  
    1.16 -<!-- &interaction.mq.qinit-help.help; -->
    1.17 +&interaction.mq.qinit-help.help;
    1.18  
    1.19      <para>You can use MQ with <emphasis>any</emphasis> Mercurial
    1.20        repository, and its commands only operate within that
    1.21        repository.  To get started, simply prepare the repository using
    1.22        the <command role="hg-ext-mq">qinit</command> command.</para>
    1.23  
    1.24 -<!-- &interaction.mq.tutorial.qinit; -->
    1.25 +&interaction.mq.tutorial.qinit;
    1.26  
    1.27      <para>This command creates an empty directory called <filename
    1.28  	role="special" class="directory">.hg/patches</filename>, where
    1.29 @@ -290,7 +290,7 @@
    1.30  	  class="directory">.hg/patches</filename> directory, as you
    1.31  	can see below.</para>
    1.32  
    1.33 -<!-- &interaction.mq.tutorial.qnew; -->
    1.34 +&interaction.mq.tutorial.qnew;
    1.35  
    1.36        <para>Also newly present in the <filename role="special"
    1.37  	  class="directory">.hg/patches</filename> directory are two
    1.38 @@ -327,7 +327,7 @@
    1.39  	use the <command role="hg-ext-mq">qrefresh</command> command
    1.40  	to update the patch you are working on.</para>
    1.41  
    1.42 -<!-- &interaction.mq.tutorial.qrefresh; -->
    1.43 +&interaction.mq.tutorial.qrefresh;
    1.44  
    1.45        <para>This command folds the changes you have made in the
    1.46  	working directory into your patch, and updates its
    1.47 @@ -340,7 +340,7 @@
    1.48  	doesn't work out, <command role="hg-cmd">hg revert</command>
    1.49  	your modifications back to the last time you refreshed.</para>
    1.50  
    1.51 -<!-- &interaction.mq.tutorial.qrefresh2; -->
    1.52 +&interaction.mq.tutorial.qrefresh2;
    1.53  
    1.54      </sect2>
    1.55      <sect2>
    1.56 @@ -352,7 +352,7 @@
    1.57  	new patch. Mercurial will apply this patch on top of your
    1.58  	existing patch.</para>
    1.59  
    1.60 -<!-- &interaction.mq.tutorial.qnew2; -->
    1.61 +&interaction.mq.tutorial.qnew2;
    1.62        <para>Notice that the patch contains the changes in our prior
    1.63  	patch as part of its context (you can see this more clearly in
    1.64  	the output of <command role="hg-cmd">hg
    1.65 @@ -365,7 +365,7 @@
    1.66  	many commands that are easier to use when you are thinking
    1.67  	about patches, as illustrated below.</para>
    1.68  
    1.69 -<!-- &interaction.mq.tutorial.qseries; -->
    1.70 +&interaction.mq.tutorial.qseries;
    1.71  
    1.72        <itemizedlist>
    1.73  	<listitem><para>The <command
    1.74 @@ -417,7 +417,7 @@
    1.75  	directory.  See below for examples of <command
    1.76  	  role="hg-ext-mq">qpop</command> and <command
    1.77  	  role="hg-ext-mq">qpush</command> in action.</para>
    1.78 -<!-- &interaction.mq.tutorial.qpop; -->
    1.79 +&interaction.mq.tutorial.qpop;
    1.80  
    1.81        <para>Notice that once we have popped a patch or two patches,
    1.82  	the output of <command role="hg-ext-mq">qseries</command>
    1.83 @@ -442,7 +442,7 @@
    1.84  	see section <xref linkend="sec:mq:perf"/>
    1.85  	below.)</para>
    1.86  
    1.87 -<!-- &interaction.mq.tutorial.qpush-a; -->
    1.88 +&interaction.mq.tutorial.qpush-a;
    1.89  
    1.90      </sect2>
    1.91      <sect2>
    1.92 @@ -458,7 +458,7 @@
    1.93  	case by the <command role="hg-cmd">hg add</command> of
    1.94  	<filename>file3</filename>.</para>
    1.95  
    1.96 -<!-- &interaction.mq.tutorial.add; -->
    1.97 +&interaction.mq.tutorial.add;
    1.98  
    1.99        <para>Commands that check the working directory all take an
   1.100  	<quote>I know what I'm doing</quote> option, which is always
   1.101 @@ -969,7 +969,7 @@
   1.102        few normal Mercurial commands in use with applied
   1.103        patches.</para>
   1.104  
   1.105 -<!-- &interaction.mq.id.output; -->
   1.106 +&interaction.mq.id.output;
   1.107  
   1.108    </sect1>
   1.109    <sect1>
   1.110 @@ -1126,7 +1126,7 @@
   1.111        prefixes of file names that inevitably confuse at least
   1.112        me.)</para>
   1.113  
   1.114 -<!-- &interaction.mq.tools.tools; -->
   1.115 +&interaction.mq.tools.tools;
   1.116  
   1.117      <para>The <literal role="package">patchutils</literal> package
   1.118        <citation>web:patchutils</citation> is invaluable. It provides a
   1.119 @@ -1196,16 +1196,22 @@
   1.120  	changes to a source tarball that you downloaded.</para>
   1.121  
   1.122        <para>Begin by downloading and unpacking the source tarball, and
   1.123 -	turning it into a Mercurial repository. <!--
   1.124 -	&interaction.mq.tarball.download; --></para>
   1.125 +	turning it into a Mercurial repository.</para>
   1.126 +
   1.127 +      &interaction.mq.tarball.download;
   1.128  
   1.129        <para>Continue by creating a patch stack and making your
   1.130 -	changes. <!-- &interaction.mq.tarball.qinit; --></para>
   1.131 +	changes.</para>
   1.132 +
   1.133 +      &interaction.mq.tarball.qinit;
   1.134  
   1.135        <para>Let's say a few weeks or months pass, and your package
   1.136  	author releases a new version.  First, bring their changes
   1.137 -	into the repository. <!-- &interaction.mq.tarball.newsource;
   1.138 -	--> The pipeline starting with <command role="hg-cmd">hg
   1.139 +	into the repository.</para>
   1.140 +
   1.141 +      &interaction.mq.tarball.newsource;
   1.142 +
   1.143 +      <para>The pipeline starting with <command role="hg-cmd">hg
   1.144  	  locate</command> above deletes all files in the working
   1.145  	directory, so that <command role="hg-cmd">hg
   1.146  	  commit</command>'s <option
   1.147 @@ -1214,7 +1220,9 @@
   1.148  	newer version of the source.</para>
   1.149  
   1.150        <para>Finally, you can apply your patches on top of the new
   1.151 -	tree. <!-- &interaction.mq.tarball.repush; --></para>
   1.152 +	tree.</para>
   1.153 +
   1.154 +      &interaction.mq.tarball.repush;
   1.155  
   1.156      </sect2>
   1.157      <sect2 id="sec:mq:combine">
   1.158 @@ -1262,7 +1270,9 @@
   1.159  	file, and you only want to move a few of those hunks, the job
   1.160  	becomes more messy, but you can still partly automate it.  Use
   1.161  	<command>lsdiff -nvv</command> to print some metadata about
   1.162 -	the patch. <!-- &interaction.mq.tools.lsdiff; --></para>
   1.163 +	the patch.</para>
   1.164 +
   1.165 +      &interaction.mq.tools.lsdiff;
   1.166  
   1.167        <para>This command prints three different kinds of
   1.168  	number:</para>