Mercurial > hgbook

changeset 833:5225ec140003

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix broken qguard example
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 14 May 2009 21:06:12 -0700
parents d5688822c51d
children 896ab6eaf1c6
files en/ch13-mq-collab.xml en/examples/mq.guards
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/en/ch13-mq-collab.xml	Thu May 07 22:32:55 2009 -0700
+++ b/en/ch13-mq-collab.xml	Thu May 14 21:06:12 2009 -0700
@@ -152,7 +152,14 @@
 
     &interaction.mq.guards.qguard.neg;
 
+    <para id="x_74a">Notice that we prefixed the arguments to the <command>hg
+	qguard</command> command with a <literal>--</literal> here, so
+      that Mercurial would not interpret the text
+      <literal>-quux</literal> as an option.</para>
+
     <note>
+      <title>Setting vs. modifying</title>
+
       <para id="x_172">  The <command role="hg-ext-mq">qguard</command> command
 	<emphasis>sets</emphasis> the guards on a patch; it doesn't
 	<emphasis>modify</emphasis> them.  What this means is that if
--- a/en/examples/mq.guards	Thu May 07 22:32:55 2009 -0700
+++ b/en/examples/mq.guards	Thu May 14 21:06:12 2009 -0700
@@ -29,7 +29,7 @@
 
 #$ name: qguard.neg
 
-hg qguard hello.patch -quux
+hg qguard -- hello.patch -quux
 hg qguard hello.patch
 
 #$ name: series