hgbook
changeset 706:5225ec140003
Fix broken qguard example
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu May 14 21:06:12 2009 -0700 (2009-05-14) |
parents | d5688822c51d |
children | f3a4e6040421 e8763d4b37b1 734111ce98ad |
files | en/ch13-mq-collab.xml en/examples/mq.guards |
line diff
1.1 --- a/en/ch13-mq-collab.xml Thu May 07 22:32:55 2009 -0700 1.2 +++ b/en/ch13-mq-collab.xml Thu May 14 21:06:12 2009 -0700 1.3 @@ -152,7 +152,14 @@ 1.4 1.5 &interaction.mq.guards.qguard.neg; 1.6 1.7 + <para id="x_74a">Notice that we prefixed the arguments to the <command>hg 1.8 + qguard</command> command with a <literal>--</literal> here, so 1.9 + that Mercurial would not interpret the text 1.10 + <literal>-quux</literal> as an option.</para> 1.11 + 1.12 <note> 1.13 + <title>Setting vs. modifying</title> 1.14 + 1.15 <para id="x_172"> The <command role="hg-ext-mq">qguard</command> command 1.16 <emphasis>sets</emphasis> the guards on a patch; it doesn't 1.17 <emphasis>modify</emphasis> them. What this means is that if
2.1 --- a/en/examples/mq.guards Thu May 07 22:32:55 2009 -0700 2.2 +++ b/en/examples/mq.guards Thu May 14 21:06:12 2009 -0700 2.3 @@ -29,7 +29,7 @@ 2.4 2.5 #$ name: qguard.neg 2.6 2.7 -hg qguard hello.patch -quux 2.8 +hg qguard -- hello.patch -quux 2.9 hg qguard hello.patch 2.10 2.11 #$ name: series