Mercurial > hgbook
comparison en/ch13-mq-collab.xml @ 724:cfdb601a3c8b
Fix imagedata fileref in xml files, and replace ':' with '.' in id attribute
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Thu, 12 Mar 2009 15:51:39 +0800 |
parents | 13513d2a128d |
children | d0160b0b1a9e |
comparison
equal
deleted
inserted
replaced
723:3c5e1c03cc3e | 724:cfdb601a3c8b |
---|---|
1 <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : --> | 1 <!-- vim: set filetype=docbkxml shiftwidth=2 autoindent expandtab tw=77 : --> |
2 | 2 |
3 <chapter id="chap:mq-collab"> | 3 <chapter id="chap.mq-collab"> |
4 <?dbhtml filename="advanced-uses-of-mercurial-queues.html"?> | 4 <?dbhtml filename="advanced-uses-of-mercurial-queues.html"?> |
5 <title>Advanced uses of Mercurial Queues</title> | 5 <title>Advanced uses of Mercurial Queues</title> |
6 | 6 |
7 <para>While it's easy to pick up straightforward uses of Mercurial | 7 <para>While it's easy to pick up straightforward uses of Mercurial |
8 Queues, use of a little discipline and some of MQ's less | 8 Queues, use of a little discipline and some of MQ's less |
428 categories, you can if you like store them in different | 428 categories, you can if you like store them in different |
429 directories; MQ has no problems with patch names that contain | 429 directories; MQ has no problems with patch names that contain |
430 path separators.</para> | 430 path separators.</para> |
431 | 431 |
432 </sect2> | 432 </sect2> |
433 <sect2 id="mq-collab:tips:interdiff"> | 433 <sect2 id="mq-collab.tips.interdiff"> |
434 <title>Viewing the history of a patch</title> | 434 <title>Viewing the history of a patch</title> |
435 | 435 |
436 <para>If you're developing a set of patches over a long time, | 436 <para>If you're developing a set of patches over a long time, |
437 it's a good idea to maintain them in a repository, as | 437 it's a good idea to maintain them in a repository, as |
438 discussed in section <xref linkend="sec:mq:repo"/>. If you do | 438 discussed in section <xref linkend="sec.mq.repo"/>. If you do |
439 so, you'll quickly | 439 so, you'll quickly |
440 discover that using the <command role="hg-cmd">hg | 440 discover that using the <command role="hg-cmd">hg |
441 diff</command> command to look at the history of changes to | 441 diff</command> command to look at the history of changes to |
442 a patch is unworkable. This is in part because you're looking | 442 a patch is unworkable. This is in part because you're looking |
443 at the second derivative of the real code (a diff of a diff), | 443 at the second derivative of the real code (a diff of a diff), |
504 </note> | 504 </note> |
505 | 505 |
506 <para>The <literal role="hg-ext">extdiff</literal> extension is | 506 <para>The <literal role="hg-ext">extdiff</literal> extension is |
507 useful for more than merely improving the presentation of MQ | 507 useful for more than merely improving the presentation of MQ |
508 patches. To read more about it, go to section <xref | 508 patches. To read more about it, go to section <xref |
509 linkend="sec:hgext:extdiff"/>.</para> | 509 linkend="sec.hgext.extdiff"/>.</para> |
510 | 510 |
511 </sect2> | 511 </sect2> |
512 </sect1> | 512 </sect1> |
513 </chapter> | 513 </chapter> |
514 | 514 |