Mercurial > hgbook
comparison en/appB-mq-ref.xml @ 828:477d6a3e5023
Many final changes.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon, 04 May 2009 23:52:38 -0700 |
| parents | b338f5490029 |
| children | 18131160f7ee |
comparison
equal
deleted
inserted
replaced
| 827:d2aacc06e562 | 828:477d6a3e5023 |
|---|---|
| 70 prints a diff of the topmost applied patch. It is equivalent | 70 prints a diff of the topmost applied patch. It is equivalent |
| 71 to <command role="hg-cmd">hg diff -r-2:-1</command>.</para> | 71 to <command role="hg-cmd">hg diff -r-2:-1</command>.</para> |
| 72 | 72 |
| 73 </sect2> | 73 </sect2> |
| 74 <sect2> | 74 <sect2> |
| 75 <title><command role="hg-ext-mq">qfold</command>&emdash;move | |
| 76 applied patches into repository history</title> | |
| 77 | |
| 78 <para>The <command>hg qfinish</command> command converts the | |
| 79 specified applied patches into permanent changes by moving | |
| 80 them out of MQ's control so that they will be treated as | |
| 81 normal repository history.</para> | |
| 82 </sect2> | |
| 83 | |
| 84 <sect2> | |
| 75 <title><command role="hg-ext-mq">qfold</command>&emdash;merge | 85 <title><command role="hg-ext-mq">qfold</command>&emdash;merge |
| 76 (<quote>fold</quote>) several patches into one</title> | 86 (<quote>fold</quote>) several patches into one</title> |
| 77 | 87 |
| 78 <para id="x_5f0">The <command role="hg-ext-mq">qfold</command> command | 88 <para id="x_5f0">The <command role="hg-ext-mq">qfold</command> command |
| 79 merges multiple patches into the topmost applied patch, so | 89 merges multiple patches into the topmost applied patch, so |
| 326 <listitem><para id="x_614">The commit message is any text from the patch | 336 <listitem><para id="x_614">The commit message is any text from the patch |
| 327 file that comes before the first diff header. If there is | 337 file that comes before the first diff header. If there is |
| 328 no such text, a default commit message is used that | 338 no such text, a default commit message is used that |
| 329 identifies the name of the patch.</para> | 339 identifies the name of the patch.</para> |
| 330 </listitem></itemizedlist> | 340 </listitem></itemizedlist> |
| 331 <para id="x_615">If a patch contains a Mercurial patch header (XXX add | 341 <para id="x_615">If a patch contains a Mercurial patch header, |
| 332 link), the information in the patch header overrides these | 342 the information in the patch header overrides these |
| 333 defaults.</para> | 343 defaults.</para> |
| 334 | 344 |
| 335 <para id="x_616">Options:</para> | 345 <para id="x_616">Options:</para> |
| 336 <itemizedlist> | 346 <itemizedlist> |
| 337 <listitem><para id="x_617"><option | 347 <listitem><para id="x_617"><option |
| 433 applied patch. With two arguments, it renames its first | 443 applied patch. With two arguments, it renames its first |
| 434 argument to its second.</para> | 444 argument to its second.</para> |
| 435 | 445 |
| 436 </sect2> | 446 </sect2> |
| 437 <sect2> | 447 <sect2> |
| 438 <title><command | |
| 439 role="hg-ext-mq">qrestore</command>&emdash;restore saved | |
| 440 queue state</title> | |
| 441 | |
| 442 <para id="x_628">XXX No idea what this does.</para> | |
| 443 | |
| 444 </sect2> | |
| 445 <sect2> | |
| 446 <title><command role="hg-ext-mq">qsave</command>&emdash;save | |
| 447 current queue state</title> | |
| 448 | |
| 449 <para id="x_629">XXX Likewise.</para> | |
| 450 | |
| 451 </sect2> | |
| 452 <sect2> | |
| 453 <title><command role="hg-ext-mq">qseries</command>&emdash;print | 448 <title><command role="hg-ext-mq">qseries</command>&emdash;print |
| 454 the entire patch series</title> | 449 the entire patch series</title> |
| 455 | 450 |
| 456 <para id="x_62a">The <command role="hg-ext-mq">qseries</command> command | 451 <para id="x_62a">The <command role="hg-ext-mq">qseries</command> command |
| 457 prints the entire patch series from the <filename | 452 prints the entire patch series from the <filename |
| 499 <listitem><para id="x_630"><option role="hg-opt-strip">-b</option>: Save | 494 <listitem><para id="x_630"><option role="hg-opt-strip">-b</option>: Save |
| 500 unrelated changesets that are intermixed with the stripped | 495 unrelated changesets that are intermixed with the stripped |
| 501 changesets in the backup bundle.</para> | 496 changesets in the backup bundle.</para> |
| 502 </listitem> | 497 </listitem> |
| 503 <listitem><para id="x_631"><option role="hg-opt-strip">-f</option>: If a | 498 <listitem><para id="x_631"><option role="hg-opt-strip">-f</option>: If a |
| 504 branch has multiple heads, remove all heads. XXX This | 499 branch has multiple heads, remove all heads.</para> |
| 505 should be renamed, and use <literal>-f</literal> to strip | |
| 506 revs when there are pending changes.</para> | |
| 507 </listitem> | 500 </listitem> |
| 508 <listitem><para id="x_632"><option role="hg-opt-strip">-n</option>: Do | 501 <listitem><para id="x_632"><option role="hg-opt-strip">-n</option>: Do |
| 509 not save a backup bundle.</para> | 502 not save a backup bundle.</para> |
| 510 </listitem></itemizedlist> | 503 </listitem></itemizedlist> |
| 511 | 504 |