hgbook
diff en/ch13-mq-collab.xml @ 567:8fcd44708f41
Uncomment all the mangled interaction examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 23:22:09 2009 -0700 (2009-03-09) |
parents | b90b024729f1 |
children | 13513d2a128d |
line diff
1.1 --- a/en/ch13-mq-collab.xml Wed Feb 18 00:22:09 2009 -0800 1.2 +++ b/en/ch13-mq-collab.xml Mon Mar 09 23:22:09 2009 -0700 1.3 @@ -108,10 +108,13 @@ 1.4 situation. MQ provides a feature called <quote>guards</quote> 1.5 (which originates with quilt's <literal>guards</literal> 1.6 command) that does just this. To start off, let's create a 1.7 - simple repository for experimenting in. <!-- 1.8 - &interaction.mq.guards.init; --> This gives us a tiny repository 1.9 - that contains two patches that don't have any dependencies on 1.10 - each other, because they touch different files.</para> 1.11 + simple repository for experimenting in.</para> 1.12 + 1.13 + &interaction.mq.guards.init; 1.14 + 1.15 + <para>This gives us a tiny repository that contains two patches 1.16 + that don't have any dependencies on each other, because they 1.17 + touch different files.</para> 1.18 1.19 <para>The idea behind conditional application is that you can 1.20 <quote>tag</quote> a patch with a <emphasis>guard</emphasis>, 1.21 @@ -133,14 +136,20 @@ 1.22 <para>The <command role="hg-ext-mq">qguard</command> command lets 1.23 you determine which guards should apply to a patch, or display 1.24 the guards that are already in effect. Without any arguments, it 1.25 - displays the guards on the current topmost patch. <!-- 1.26 - &interaction.mq.guards.qguard; --> To set a positive guard on a 1.27 - patch, prefix the name of the guard with a 1.28 - <quote><literal>+</literal></quote>. <!-- 1.29 - &interaction.mq.guards.qguard.pos; --> To set a negative guard 1.30 + displays the guards on the current topmost patch.</para> 1.31 + 1.32 + &interaction.mq.guards.qguard; 1.33 + 1.34 + <para>To set a positive guard on a patch, prefix the name of the 1.35 + guard with a <quote><literal>+</literal></quote>.</para> 1.36 + 1.37 + &interaction.mq.guards.qguard.pos; 1.38 + 1.39 + <para>To set a negative guard 1.40 on a patch, prefix the name of the guard with a 1.41 - <quote><literal>-</literal></quote>. <!-- 1.42 - &interaction.mq.guards.qguard.neg; --></para> 1.43 + <quote><literal>-</literal></quote>.</para> 1.44 + 1.45 + &interaction.mq.guards.qguard.neg; 1.46 1.47 <note> 1.48 <para> The <command role="hg-ext-mq">qguard</command> command 1.49 @@ -158,8 +167,9 @@ 1.50 other words, you don't have to use the <command 1.51 role="hg-ext-mq">qguard</command> command if you don't want 1.52 to; it's okay to simply edit the <filename 1.53 - role="special">series</filename> file.) <!-- 1.54 - &interaction.mq.guards.series; --></para> 1.55 + role="special">series</filename> file.)</para> 1.56 + 1.57 + &interaction.mq.guards.series; 1.58 1.59 </sect1> 1.60 <sect1> 1.61 @@ -175,26 +185,38 @@ 1.62 <para>With no arguments, the <command 1.63 role="hg-ext-mq">qselect</command> command lists the guards 1.64 currently in effect, one per line of output. Each argument is 1.65 - treated as the name of a guard to apply. <!-- 1.66 - &interaction.mq.guards.qselect.foo; --> In case you're 1.67 - interested, the currently selected guards are stored in the 1.68 - <filename role="special">guards</filename> file. <!-- 1.69 - &interaction.mq.guards.qselect.cat; --> We can see the effect 1.70 - the selected guards have when we run <command 1.71 - role="hg-ext-mq">qpush</command>. <!-- 1.72 - &interaction.mq.guards.qselect.qpush; --></para> 1.73 + treated as the name of a guard to apply.</para> 1.74 + 1.75 + &interaction.mq.guards.qselect.foo; 1.76 + 1.77 + <para>In case you're interested, the currently selected guards are 1.78 + stored in the <filename role="special">guards</filename> file.</para> 1.79 + 1.80 + &interaction.mq.guards.qselect.cat; 1.81 + 1.82 + <para>We can see the effect the selected guards have when we run 1.83 + <command role="hg-ext-mq">qpush</command>.</para> 1.84 + 1.85 + &interaction.mq.guards.qselect.qpush; 1.86 1.87 <para>A guard cannot start with a 1.88 <quote><literal>+</literal></quote> or 1.89 <quote><literal>-</literal></quote> character. The name of a 1.90 guard must not contain white space, but most other characters 1.91 are acceptable. If you try to use a guard with an invalid name, 1.92 - MQ will complain: <!-- &interaction.mq.guards.qselect.error; --> 1.93 - Changing the selected guards changes the patches that are 1.94 - applied. <!-- &interaction.mq.guards.qselect.quux; --> You can 1.95 - see in the example below that negative guards take precedence 1.96 - over positive guards. <!-- 1.97 - &interaction.mq.guards.qselect.foobar; --></para> 1.98 + MQ will complain:</para> 1.99 + 1.100 + &interaction.mq.guards.qselect.error; 1.101 + 1.102 + <para>Changing the selected guards changes the patches that are 1.103 + applied.</para> 1.104 + 1.105 + &interaction.mq.guards.qselect.quux; 1.106 + 1.107 + <para>You can see in the example below that negative guards take 1.108 + precedence over positive guards.</para> 1.109 + 1.110 + &interaction.mq.guards.qselect.foobar; 1.111 1.112 </sect1> 1.113 <sect1>