comparison en/ch02-tour-basic.xml @ 746:d0160b0b1a9e

Merge with http://hg.serpentine.com/mercurial/book
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed, 18 Mar 2009 20:32:37 +0800
parents 1114da00d30e 80928ea6e7ae
children
comparison
equal deleted inserted replaced
745:c2cefd9f9893 746:d0160b0b1a9e
549 Mercurial will use this file to look up your personalised 549 Mercurial will use this file to look up your personalised
550 configuration settings. The initial contents of your 550 configuration settings. The initial contents of your
551 <filename role="special">.hgrc</filename> should look like 551 <filename role="special">.hgrc</filename> should look like
552 this.</para> 552 this.</para>
553 <programlisting># This is a Mercurial configuration file. 553 <programlisting># This is a Mercurial configuration file.
554 [ui] username = Firstname Lastname 554 [ui]
555 username = Firstname Lastname
555 &lt;email.address@domain.net&gt;</programlisting> 556 &lt;email.address@domain.net&gt;</programlisting>
556 557
557 <para>The <quote><literal>[ui]</literal></quote> line begins a 558 <para>The <quote><literal>[ui]</literal></quote> line begins a
558 <emphasis>section</emphasis> of the config file, so you can 559 <emphasis>section</emphasis> of the config file, so you can
559 read the <quote><literal>username = ...</literal></quote> 560 read the <quote><literal>username = ...</literal></quote>
621 hence has a summary that is not 622 hence has a summary that is not
622 readable.</para> 623 readable.</para>
623 624
624 <programlisting> 625 <programlisting>
625 changeset: 73:584af0e231be 626 changeset: 73:584af0e231be
626 user: Censored Person &lt;censored.person@example.org&gt; 627 user: Censored Person &lt;censored.person@example.org&gt;
627 date: Tue Sep 26 21:37:07 2006 -0700 628 date: Tue Sep 26 21:37:07 2006 -0700
628 summary: include buildmeister/commondefs. Add exports.</programlisting> 629 summary: include buildmeister/commondefs. Add exports.</programlisting>
629 630
630 <para>As far as the remainder of the contents of the 631 <para>As far as the remainder of the contents of the
631 commit message are concerned, there are no hard-and-fast 632 commit message are concerned, there are no hard-and-fast
632 rules. Mercurial itself doesn't interpret or care about the 633 rules. Mercurial itself doesn't interpret or care about the