# HG changeset patch # User Steve Borho # Date 1256701609 18000 # Node ID 102f89d20be133b8b0e9ff3596156149db00cc0f # Parent 9ba99e6dc2555d74d121308673be2a5750eb9cf9 remove spurious 'hg' from mq command line options diff -r 9ba99e6dc255 -r 102f89d20be1 en/ch12-mq.xml --- a/en/ch12-mq.xml Sun Oct 18 22:55:10 2009 -0700 +++ b/en/ch12-mq.xml Tue Oct 27 22:46:49 2009 -0500 @@ -438,7 +438,7 @@ qpop each operate on a single patch at a time by default, you can push and pop many patches in one go. The option to + role="hg-ext-mq-cmd-qpush-opt">-a option to qpush causes it to push all unapplied patches, while the option to -f. The exact meaning of depends on the command. For example, hg qnew + role="hg-ext-mq-cmd-qnew-opt">-f will incorporate any outstanding changes into the new patch it creates, but hg qpop + role="hg-ext-mq-cmd-qpop-opt">-f will revert modifications to any files affected by the patch that it is popping. Be sure to read the documentation for a command's option before you use it! @@ -808,9 +808,9 @@ On my old, slow laptop, I was able to hg qpush all + role="hg-ext-mq-cmd-qpush-opt">-a all 1,738 patches in 3.5 minutes, and hg qpop - + them all in 30 seconds. (On a newer laptop, the time to push all patches dropped to two minutes.) I could qrefresh one of the biggest patches @@ -866,7 +866,7 @@ -a your patches, then hg pull changes into the underlying repository, and finally hg qpush your + role="hg-ext-mq-cmd-qpop-opt">-a your patches again. MQ will stop pushing any time it runs across a patch that fails to apply during conflicts, allowing you to fix your conflicts, qrefresh the @@ -1138,9 +1138,9 @@ update changes to patches or the series file, you will have to hg qpop and + role="hg-ext-mq-cmd-qpop-opt">-a and then hg qpush in + role="hg-ext-mq-cmd-qpush-opt">-a in the underlying repository to see those changes show up there. If you forget to do this, you can confuse MQ's idea of which patches are applied.