Mercurial > hgbook
comparison en/ch01-tour-basic.xml @ 775:29f0f79cf614
Update paragraph IDs
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 16 Apr 2009 23:46:45 -0700 |
parents | 3b640272a966 |
children | c8d662d3cb40 |
comparison
equal
deleted
inserted
replaced
774:e6c99cbd0abd | 775:29f0f79cf614 |
---|---|
129 called <command role="hg-cmd">hg clone</command>, because it | 129 called <command role="hg-cmd">hg clone</command>, because it |
130 makes an identical copy of an existing repository.</para> | 130 makes an identical copy of an existing repository.</para> |
131 | 131 |
132 &interaction.tour.clone; | 132 &interaction.tour.clone; |
133 | 133 |
134 <para>One advantage of using <command role="hg-cmd">hg | 134 <para id="x_67c">One advantage of using <command role="hg-cmd">hg |
135 clone</command> is that, as we can see above, it lets us clone | 135 clone</command> is that, as we can see above, it lets us clone |
136 repositories over the network. Another is that it remembers | 136 repositories over the network. Another is that it remembers |
137 where we cloned from, which we'll find useful soon when we | 137 where we cloned from, which we'll find useful soon when we |
138 want to fetch new changes from another repository.</para> | 138 want to fetch new changes from another repository.</para> |
139 | 139 |
231 person who created the changeset.)</para></listitem> | 231 person who created the changeset.)</para></listitem> |
232 <listitem><para id="x_21"><literal>summary</literal>: The first line of | 232 <listitem><para id="x_21"><literal>summary</literal>: The first line of |
233 the text message that the creator of the changeset entered | 233 the text message that the creator of the changeset entered |
234 to describe the changeset.</para></listitem> | 234 to describe the changeset.</para></listitem> |
235 <listitem> | 235 <listitem> |
236 <para>Some changesets, such as the first in the list above, | 236 <para id="x_67d">Some changesets, such as the first in the list above, |
237 have a <literal>tag</literal> field. A tag is another way | 237 have a <literal>tag</literal> field. A tag is another way |
238 to identify a changeset, by giving it an easy-to-remember | 238 to identify a changeset, by giving it an easy-to-remember |
239 name. (The tag named <literal>tip</literal> is special: it | 239 name. (The tag named <literal>tip</literal> is special: it |
240 always refers to the newest change in a repository.)</para> | 240 always refers to the newest change in a repository.)</para> |
241 </listitem> | 241 </listitem> |
362 (if you've never seen a unified diff before, see <xref | 362 (if you've never seen a unified diff before, see <xref |
363 linkend="sec:mq:patch"/> for an overview).</para> | 363 linkend="sec:mq:patch"/> for an overview).</para> |
364 | 364 |
365 &interaction.tour.log-vp; | 365 &interaction.tour.log-vp; |
366 | 366 |
367 <para>The <option role="hg-opt-log">-p</option> option is | 367 <para id="x_67e">The <option role="hg-opt-log">-p</option> option is |
368 tremendously useful, so it's well worth remembering.</para> | 368 tremendously useful, so it's well worth remembering.</para> |
369 | 369 |
370 </sect2> | 370 </sect2> |
371 </sect1> | 371 </sect1> |
372 | 372 |
408 a changeset ID or revision number accepts both <option | 408 a changeset ID or revision number accepts both <option |
409 role="hg-opt-log">-r</option> and <option | 409 role="hg-opt-log">-r</option> and <option |
410 role="hg-opt-log">--rev</option> arguments.</para> | 410 role="hg-opt-log">--rev</option> arguments.</para> |
411 </listitem> | 411 </listitem> |
412 <listitem> | 412 <listitem> |
413 <para>If you are using short options, you can save typing by | 413 <para id="x_67f">If you are using short options, you can save typing by |
414 running them together. For example, the command <command | 414 running them together. For example, the command <command |
415 role="hg-cmd">hg log -v -p -r 2</command> can be written | 415 role="hg-cmd">hg log -v -p -r 2</command> can be written |
416 as <command role="hg-cmd">hg log -vpr2</command>.</para> | 416 as <command role="hg-cmd">hg log -vpr2</command>.</para> |
417 </listitem> | 417 </listitem> |
418 </itemizedlist> | 418 </itemizedlist> |
428 <option role="hg-opt-global">--quiet</option>).</para> | 428 <option role="hg-opt-global">--quiet</option>).</para> |
429 | 429 |
430 <note> | 430 <note> |
431 <title>Option naming consistency</title> | 431 <title>Option naming consistency</title> |
432 | 432 |
433 <para>Almost always, Mercurial commands use consistent option | 433 <para id="x_680">Almost always, Mercurial commands use consistent option |
434 names to refer to the same concepts. For instance, if a | 434 names to refer to the same concepts. For instance, if a |
435 command deals with changesets, you'll always identify them | 435 command deals with changesets, you'll always identify them |
436 with <option role="hg-opt-log">--rev</option> or <option | 436 with <option role="hg-opt-log">--rev</option> or <option |
437 role="hg-opt-log">-r</option>. This consistent use of | 437 role="hg-opt-log">-r</option>. This consistent use of |
438 option names makes it easier to remember what options a | 438 option names makes it easier to remember what options a |
452 clone</command> command, but we don't need to clone a copy of | 452 clone</command> command, but we don't need to clone a copy of |
453 the remote repository. Since we already have a copy of it | 453 the remote repository. Since we already have a copy of it |
454 locally, we can just clone that instead. This is much faster | 454 locally, we can just clone that instead. This is much faster |
455 than cloning over the network, and cloning a local repository | 455 than cloning over the network, and cloning a local repository |
456 uses less disk space in most cases, too<footnote> | 456 uses less disk space in most cases, too<footnote> |
457 <para>The saving of space arises when source and destination | 457 <para id="x_681">The saving of space arises when source and destination |
458 repositories are on the same filesystem, in which case | 458 repositories are on the same filesystem, in which case |
459 Mercurial will use hardlinks to do copy-on-write sharing of | 459 Mercurial will use hardlinks to do copy-on-write sharing of |
460 its internal metadata. If that explanation meant nothing to | 460 its internal metadata. If that explanation meant nothing to |
461 you, don't worry: everything happens transparently and | 461 you, don't worry: everything happens transparently and |
462 automatically, and you don't need to understand it.</para> | 462 automatically, and you don't need to understand it.</para> |
477 repository, we have a file <filename>hello.c</filename> that | 477 repository, we have a file <filename>hello.c</filename> that |
478 contains the classic <quote>hello, world</quote> program.</para> | 478 contains the classic <quote>hello, world</quote> program.</para> |
479 | 479 |
480 &interaction.tour.cat1; | 480 &interaction.tour.cat1; |
481 | 481 |
482 <para>Let's edit this file so that it prints a second line of | 482 <para id="x_682">Let's edit this file so that it prints a second line of |
483 output.</para> | 483 output.</para> |
484 | 484 |
485 &interaction.tour.cat2; | 485 &interaction.tour.cat2; |
486 | 486 |
487 <para id="x_3c">Mercurial's <command role="hg-cmd">hg status</command> | 487 <para id="x_3c">Mercurial's <command role="hg-cmd">hg status</command> |
514 &interaction.tour.diff; | 514 &interaction.tour.diff; |
515 | 515 |
516 <tip> | 516 <tip> |
517 <title>Understanding patches</title> | 517 <title>Understanding patches</title> |
518 | 518 |
519 <para>Remember to take a look at <xref | 519 <para id="x_683">Remember to take a look at <xref |
520 linkend="sec:mq:patch"/> if you don't know how to read | 520 linkend="sec:mq:patch"/> if you don't know how to read |
521 output above.</para> | 521 output above.</para> |
522 </tip> | 522 </tip> |
523 </sect1> | 523 </sect1> |
524 <sect1> | 524 <sect1> |
724 | 724 |
725 <para id="x_57">We refer to the newest revision in the | 725 <para id="x_57">We refer to the newest revision in the |
726 repository as the <emphasis>tip revision</emphasis>, or simply | 726 repository as the <emphasis>tip revision</emphasis>, or simply |
727 the <emphasis>tip</emphasis>.</para> | 727 the <emphasis>tip</emphasis>.</para> |
728 | 728 |
729 <para>By the way, the <command role="hg-cmd">hg tip</command> | 729 <para id="x_684">By the way, the <command role="hg-cmd">hg tip</command> |
730 command accepts many of the same options as <command | 730 command accepts many of the same options as <command |
731 role="hg-cmd">hg log</command>, so <option | 731 role="hg-cmd">hg log</command>, so <option |
732 role="hg-opt-global">-v</option> above indicates <quote>be | 732 role="hg-opt-global">-v</option> above indicates <quote>be |
733 verbose</quote>, <option role="hg-opt-tip">-p</option> | 733 verbose</quote>, <option role="hg-opt-tip">-p</option> |
734 specifies <quote>print a patch</quote>. The use of <option | 734 specifies <quote>print a patch</quote>. The use of <option |