-#: ../en/ch02-tour-basic.xml:52 +msgstr "Ubuntu: Ubuntu 的 Mercurial 包基于 Debian。安装时，使用如下命令：" + +#. type: Content of: <book><chapter><sect1><sect2><title> +#: ../en/ch02-tour-basic.xml:48 msgid "Solaris" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:54 +msgstr "Solaris" + +#. type: Content of: <book><chapter><sect1><sect2><para> +#: ../en/ch02-tour-basic.xml:50 msgid "" "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." "sunfreeware.com</ulink>, is a good source for a large number of pre-built " "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including " "current versions of Mercurial." msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:62 +"位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" +"ulink> 的 SunFreeWare 是很好的二进制安装源，它包含 Intel 和 Sparc 架构的 32 位" +"和 64 位包，包含 Mercurial 的当前版本。" + +#. type: Content of: <book><chapter><sect1><sect2><title> +#: ../en/ch02-tour-basic.xml:58 msgid "Mac OS X" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:64 +msgstr "Mac OS X" + +#. type: Content of: <book><chapter><sect1><sect2><para> +#: ../en/ch02-tour-basic.xml:60 msgid "" "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " @@ -2550,7 +2553,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:73 +#: ../en/ch02-tour-basic.xml:69 msgid "" "It's also possible to install Mercurial using Fink or MacPorts, two popular " "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-" @@ -2559,12 +2562,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:81 +#: ../en/ch02-tour-basic.xml:77 msgid "Windows" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:83 +#: ../en/ch02-tour-basic.xml:79 msgid "" "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url=" "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " @@ -2572,7 +2575,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><note><para> -#: ../en/ch02-tour-basic.xml:90 +#: ../en/ch02-tour-basic.xml:86 msgid "" "The Windows version of Mercurial does not automatically convert line endings " "between Windows and Unix styles. If you want to share work with Unix users, " @@ -2580,12 +2583,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:100 +#: ../en/ch02-tour-basic.xml:96 msgid "Getting started" msgstr "开始" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:102 +#: ../en/ch02-tour-basic.xml:98 msgid "" "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command " "to find out whether Mercurial is actually installed properly. The actual " @@ -2594,12 +2597,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:111 +#: ../en/ch02-tour-basic.xml:107 msgid "Built-in help" msgstr "内置帮助" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:113 +#: ../en/ch02-tour-basic.xml:109 msgid "" "Mercurial provides a built-in help system. This is invaluable for those " "times when you find yourself stuck trying to remember how to run a command. " @@ -2610,7 +2613,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:124 +#: ../en/ch02-tour-basic.xml:120 msgid "" "For a more impressive level of detail (which you won't usually need) run " "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></" @@ -2620,12 +2623,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:135 +#: ../en/ch02-tour-basic.xml:131 msgid "Working with a repository" msgstr "使用版本库" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:137 +#: ../en/ch02-tour-basic.xml:133 msgid "" "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. " "The repository for a project contains all of the files that <quote>belong to</" @@ -2633,7 +2636,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:143 +#: ../en/ch02-tour-basic.xml:139 msgid "" "There's nothing particularly magical about a repository; it is simply a " "directory tree in your filesystem that Mercurial treats as special. You can " @@ -2642,12 +2645,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:150 +#: ../en/ch02-tour-basic.xml:146 msgid "Making a local copy of a repository" msgstr "创建版本库的工作副本" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:152 +#: ../en/ch02-tour-basic.xml:148 msgid "" "<emphasis>Copying</emphasis> a repository is just a little bit special. " "While you could use a normal file copying command to make a copy of a " @@ -2657,21 +2660,21 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:161 +#: ../en/ch02-tour-basic.xml:157 msgid "" "If our clone succeeded, we should now have a local directory called <filename " "class=\"directory\">hello</filename>. This directory will contain some files." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:167 +#: ../en/ch02-tour-basic.xml:163 msgid "" "These files have the same contents and history in our repository as they do " "in the repository we cloned." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:170 +#: ../en/ch02-tour-basic.xml:166 msgid "" "Every Mercurial repository is complete, self-contained, and independent. It " "contains its own private copy of a project's files and history. A cloned " @@ -2681,7 +2684,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:177 +#: ../en/ch02-tour-basic.xml:173 msgid "" "What this means for now is that we're free to experiment with our repository, " "safe in the knowledge that it's a private <quote>sandbox</quote> that won't " @@ -2689,12 +2692,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:183 +#: ../en/ch02-tour-basic.xml:179 msgid "What's in a repository?" msgstr "什么是版本库?" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:185 +#: ../en/ch02-tour-basic.xml:181 msgid "" "When we take a more detailed look inside a repository, we can see that it " "contains a directory named <filename class=\"directory\">.hg</filename>. " @@ -2702,7 +2705,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:192 +#: ../en/ch02-tour-basic.xml:188 msgid "" "The contents of the <filename class=\"directory\">.hg</filename> directory " "and its subdirectories are private to Mercurial. Every other file and " @@ -2710,7 +2713,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:198 +#: ../en/ch02-tour-basic.xml:194 msgid "" "To introduce a little terminology, the <filename class=\"directory\">.hg</" "filename> directory is the <quote>real</quote> repository, and all of the " @@ -2723,12 +2726,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:213 +#: ../en/ch02-tour-basic.xml:209 msgid "A tour through history" msgstr "回溯历史" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:215 +#: ../en/ch02-tour-basic.xml:211 msgid "" "One of the first things we might want to do with a new, unfamiliar repository " "is understand its history. The <command role=\"hg-cmd\">hg log</command> " @@ -2736,7 +2739,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:222 +#: ../en/ch02-tour-basic.xml:218 msgid "" "By default, this command prints a brief paragraph of output for each change " "to the project that was recorded. In Mercurial terminology, we call each of " @@ -2745,14 +2748,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:228 +#: ../en/ch02-tour-basic.xml:224 msgid "" "The fields in a record of output from <command role=\"hg-cmd\">hg log</" "command> are as follows." msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:231 +#: ../en/ch02-tour-basic.xml:227 msgid "" "<literal>changeset</literal>: This field has the format of a number, followed " "by a colon, followed by a hexadecimal string. These are " @@ -2762,7 +2765,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:237 +#: ../en/ch02-tour-basic.xml:233 msgid "" "<literal>user</literal>: The identity of the person who created the " "changeset. This is a free-form field, but it most often contains a person's " @@ -2770,7 +2773,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:241 +#: ../en/ch02-tour-basic.xml:237 msgid "" "<literal>date</literal>: The date and time on which the changeset was " "created, and the timezone in which it was created. (The date and time are " @@ -2779,22 +2782,22 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:246 +#: ../en/ch02-tour-basic.xml:242 msgid "" "<literal>summary</literal>: The first line of the text message that the " "creator of the changeset entered to describe the changeset." msgstr "" #. type: Content of: <book><chapter><sect1><para> +#: ../en/ch02-tour-basic.xml:245 +msgid "" +"The default output printed by <command role=\"hg-cmd\">hg log</command> is " +"purely a summary; it is missing a lot of detail." +msgstr "" + +#. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:249 msgid "" -"The default output printed by <command role=\"hg-cmd\">hg log</command> is " -"purely a summary; it is missing a lot of detail." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:253 -msgid "" "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-" "basic.history\"/> provides a graphical representation of the history of the " "<filename class=\"directory\">hello</filename> repository, to make it a " @@ -2804,13 +2807,13 @@ msgstr "" #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject> -#: ../en/ch02-tour-basic.xml:264 +#: ../en/ch02-tour-basic.xml:260 msgid "" "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase> -#: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48 +#: ../en/ch02-tour-basic.xml:261 ../en/ch03-tour-merge.xml:48 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108 @@ -2824,19 +2827,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para> -#: ../en/ch02-tour-basic.xml:266 +#: ../en/ch02-tour-basic.xml:262 msgid "" "Graphical history of the <filename class=\"directory\">hello</filename> " "repository" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:273 +#: ../en/ch02-tour-basic.xml:269 msgid "Changesets, revisions, and talking to other people" msgstr "改变集，版本，与其它用户交互" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:276 +#: ../en/ch02-tour-basic.xml:272 msgid "" "As English is a notoriously sloppy language, and computer science has a " "hallowed history of terminological confusion (why use one term when four will " @@ -2848,7 +2851,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:286 +#: ../en/ch02-tour-basic.xml:282 msgid "" "While it doesn't matter what <emphasis>word</emphasis> you use to refer to " "the concept of <quote>a changeset</quote>, the <emphasis>identifier</" @@ -2859,13 +2862,13 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:295 +#: ../en/ch02-tour-basic.xml:291 msgid "" "The revision number is <emphasis>only valid in that repository</emphasis>," msgstr "" #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:297 +#: ../en/ch02-tour-basic.xml:293 msgid "" "while the hex string is the <emphasis>permanent, unchanging identifier</" "emphasis> that will always identify that exact changeset in <emphasis>every</" @@ -2873,7 +2876,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:302 +#: ../en/ch02-tour-basic.xml:298 msgid "" "This distinction is important. If you send someone an email talking about " "<quote>revision 33</quote>, there's a high likelihood that their revision 33 " @@ -2885,7 +2888,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:312 +#: ../en/ch02-tour-basic.xml:308 msgid "" "Mercurial uses revision numbers purely as a convenient shorthand. If you " "need to discuss a changeset with someone, or make a record of a changeset for " @@ -2894,12 +2897,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:320 +#: ../en/ch02-tour-basic.xml:316 msgid "Viewing specific revisions" msgstr "察看指定版本" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:322 +#: ../en/ch02-tour-basic.xml:318 msgid "" "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a " "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option " @@ -2909,7 +2912,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:331 +#: ../en/ch02-tour-basic.xml:327 msgid "" "If you want to see the history of several revisions without having to list " "each one, you can use <emphasis>range notation</emphasis>; this lets you " @@ -2918,7 +2921,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:339 +#: ../en/ch02-tour-basic.xml:335 msgid "" "Mercurial also honours the order in which you specify revisions, so <command " "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command " @@ -2926,12 +2929,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:346 +#: ../en/ch02-tour-basic.xml:342 msgid "More detailed information" msgstr "更详细的信息" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:348 +#: ../en/ch02-tour-basic.xml:344 msgid "" "While the summary information printed by <command role=\"hg-cmd\">hg log</" "command> is useful if you already know what you're looking for, you may need " @@ -2943,7 +2946,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:360 +#: ../en/ch02-tour-basic.xml:356 msgid "" "If you want to see both the description and content of a change, add the " "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--" @@ -2953,12 +2956,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:373 +#: ../en/ch02-tour-basic.xml:369 msgid "All about command options" msgstr "命令选项" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:375 +#: ../en/ch02-tour-basic.xml:371 msgid "" "Let's take a brief break from exploring Mercurial commands to discuss a " "pattern in the way that they work; you may find this useful to keep in mind " @@ -2966,7 +2969,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:379 +#: ../en/ch02-tour-basic.xml:375 msgid "" "Mercurial has a consistent and straightforward approach to dealing with the " "options that you can pass to commands. It follows the conventions for " @@ -2974,16 +2977,16 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#: ../en/ch02-tour-basic.xml:380 +msgid "" +"Every option has a long name. For example, as we've already seen, the " +"<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" +"opt-log\">--rev</option> option." +msgstr "" + +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> #: ../en/ch02-tour-basic.xml:384 msgid "" -"Every option has a long name. For example, as we've already seen, the " -"<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" -"opt-log\">--rev</option> option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:388 -msgid "" "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--" "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The " "reason that some options don't have short names is that the options in " @@ -2991,7 +2994,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:393 +#: ../en/ch02-tour-basic.xml:389 msgid "" "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</" "option>), while short options start with one (e.g. <option role=\"hg-opt-log" @@ -2999,7 +3002,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:397 +#: ../en/ch02-tour-basic.xml:393 msgid "" "Option naming and usage is consistent across commands. For example, every " "command that lets you specify a changeset ID or revision number accepts both " @@ -3008,7 +3011,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:403 +#: ../en/ch02-tour-basic.xml:399 msgid "" "In the examples throughout this book, I use short options instead of long. " "This just reflects my own preference, so don't read anything significant into " @@ -3016,7 +3019,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:407 +#: ../en/ch02-tour-basic.xml:403 msgid "" "Most commands that print output of some kind will print more output when " "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-" @@ -3025,20 +3028,20 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:415 +#: ../en/ch02-tour-basic.xml:411 msgid "Making and reviewing changes" msgstr "创建和复审修改" #. type: Content of: <book><chapter><sect1><para> +#: ../en/ch02-tour-basic.xml:413 +msgid "" +"Now that we have a grasp of viewing history in Mercurial, let's take a look " +"at making some changes and examining them." +msgstr "" + +#. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:417 msgid "" -"Now that we have a grasp of viewing history in Mercurial, let's take a look " -"at making some changes and examining them." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:421 -msgid "" "The first thing we'll do is isolate our experiment in a repository of its " "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we " "don't need to clone a copy of the remote repository. Since we already have a " @@ -3048,7 +3051,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:431 +#: ../en/ch02-tour-basic.xml:427 msgid "" "As an aside, it's often good practice to keep a <quote>pristine</quote> copy " "of a remote repository around, which you can then make temporary clones of to " @@ -3060,7 +3063,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:440 +#: ../en/ch02-tour-basic.xml:436 msgid "" "In our <filename class=\"directory\">my-hello</filename> repository, we have " "a file <filename>hello.c</filename> that contains the classic <quote>hello, " @@ -3073,14 +3076,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:453 +#: ../en/ch02-tour-basic.xml:449 msgid "" "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us " "what Mercurial knows about the files in the repository." msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:459 +#: ../en/ch02-tour-basic.xml:455 msgid "" "The <command role=\"hg-cmd\">hg status</command> command prints no output for " "some files, but a line starting with <quote><literal>M</literal></quote> for " @@ -3090,7 +3093,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:466 +#: ../en/ch02-tour-basic.xml:462 msgid "" "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed " "that we modified <filename>hello.c</filename>. We didn't need to " @@ -3100,7 +3103,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:474 +#: ../en/ch02-tour-basic.xml:470 msgid "" "It's a little bit helpful to know that we've modified <filename>hello.c</" "filename>, but we might prefer to know exactly <emphasis>what</emphasis> " @@ -3109,12 +3112,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:484 +#: ../en/ch02-tour-basic.xml:480 msgid "Recording changes in a new changeset" msgstr "在新修改集中记录修改" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:486 +#: ../en/ch02-tour-basic.xml:482 msgid "" "We can modify files, build and test our changes, and use <command role=\"hg-" "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to " @@ -3123,7 +3126,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:493 +#: ../en/ch02-tour-basic.xml:489 msgid "" "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new " "changeset; we'll usually refer to this as <quote>making a commit</quote> or " @@ -3131,12 +3134,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:499 +#: ../en/ch02-tour-basic.xml:495 msgid "Setting up a username" msgstr "配置用户名称" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:501 +#: ../en/ch02-tour-basic.xml:497 msgid "" "When you try to run <command role=\"hg-cmd\">hg commit</command> for the " "first time, it is not guaranteed to succeed. Mercurial records your name and " @@ -3147,7 +3150,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:510 +#: ../en/ch02-tour-basic.xml:506 msgid "" "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the " "<command role=\"hg-cmd\">hg commit</command> command on the command line, " @@ -3155,14 +3158,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:515 +#: ../en/ch02-tour-basic.xml:511 msgid "" "If you have set the <envar>HGUSER</envar> environment variable, this is " "checked next." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:518 +#: ../en/ch02-tour-basic.xml:514 msgid "" "If you create a file in your home directory called <filename role=\"special" "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> " @@ -3171,14 +3174,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:525 +#: ../en/ch02-tour-basic.xml:521 msgid "" "If you have set the <envar>EMAIL</envar> environment variable, this will be " "used next." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:528 +#: ../en/ch02-tour-basic.xml:524 msgid "" "Mercurial will query your system to find out your local user name and host " "name, and construct a username from these components. Since this often " @@ -3187,7 +3190,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:535 +#: ../en/ch02-tour-basic.xml:531 msgid "" "If all of these mechanisms fail, Mercurial will fail, printing an error " "message. In this case, it will not let you commit until you set up a " @@ -3195,7 +3198,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:539 +#: ../en/ch02-tour-basic.xml:535 msgid "" "You should think of the <envar>HGUSER</envar> environment variable and the " "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-" @@ -3206,12 +3209,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><title> -#: ../en/ch02-tour-basic.xml:548 +#: ../en/ch02-tour-basic.xml:544 msgid "Creating a Mercurial configuration file" msgstr "创建 Mercurial 的配置文件" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:550 +#: ../en/ch02-tour-basic.xml:546 msgid "" "To set a user name, use your favourite editor to create a file called " "<filename role=\"special\">.hgrc</filename> in your home directory. " @@ -3221,7 +3224,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:561 +#: ../en/ch02-tour-basic.xml:557 msgid "" "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</" "emphasis> of the config file, so you can read the <quote><literal>username " @@ -3233,12 +3236,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><title> -#: ../en/ch02-tour-basic.xml:574 +#: ../en/ch02-tour-basic.xml:570 msgid "Choosing a user name" msgstr "选择用户名称" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:576 +#: ../en/ch02-tour-basic.xml:572 msgid "" "You can use any text you like as the value of the <literal>username</literal> " "config item, since this information is for reading by other people, but for " @@ -3247,7 +3250,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para> -#: ../en/ch02-tour-basic.xml:583 +#: ../en/ch02-tour-basic.xml:579 msgid "" "Mercurial's built-in web server obfuscates email addresses, to make it more " "difficult for the email harvesting tools that spammers use. This reduces the " @@ -3256,12 +3259,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:593 +#: ../en/ch02-tour-basic.xml:589 msgid "Writing a commit message" msgstr "写提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:595 +#: ../en/ch02-tour-basic.xml:591 msgid "" "When we commit a change, Mercurial drops us into a text editor, to enter a " "message that will describe the modifications we've made in this changeset. " @@ -3271,7 +3274,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:605 +#: ../en/ch02-tour-basic.xml:601 msgid "" "The editor that the <command role=\"hg-cmd\">hg commit</command> command " "drops us into will contain an empty line, followed by a number of lines " @@ -3279,7 +3282,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:612 +#: ../en/ch02-tour-basic.xml:608 msgid "" "Mercurial ignores the lines that start with <quote><literal>HG:</literal></" "quote>; it uses them only to tell us which files it's recording changes to. " @@ -3287,12 +3290,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:618 +#: ../en/ch02-tour-basic.xml:614 msgid "Writing a good commit message" msgstr "写好提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:620 +#: ../en/ch02-tour-basic.xml:616 msgid "" "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of " "a commit message by default, it's best to write a commit message whose first " @@ -3302,7 +3305,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:634 +#: ../en/ch02-tour-basic.xml:630 msgid "" "As far as the remainder of the contents of the commit message are concerned, " "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care " @@ -3311,7 +3314,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:640 +#: ../en/ch02-tour-basic.xml:636 msgid "" "My personal preference is for short, but informative, commit messages that " "tell me something that I can't figure out with a quick glance at the output " @@ -3319,12 +3322,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:647 +#: ../en/ch02-tour-basic.xml:643 msgid "Aborting a commit" msgstr "终止提交" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:649 +#: ../en/ch02-tour-basic.xml:645 msgid "" "If you decide that you don't want to commit while in the middle of editing a " "commit message, simply exit from your editor without saving the file that " @@ -3333,7 +3336,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:654 +#: ../en/ch02-tour-basic.xml:650 msgid "" "If we run the <command role=\"hg-cmd\">hg commit</command> command without " "any arguments, it records all of the changes we've made, as reported by " @@ -3342,12 +3345,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:661 +#: ../en/ch02-tour-basic.xml:657 msgid "Admiring our new handiwork" msgstr "欣赏我们的新手艺" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:663 +#: ../en/ch02-tour-basic.xml:659 msgid "" "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg " "tip</command> command to display the changeset we just created. This command " @@ -3356,19 +3359,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:672 +#: ../en/ch02-tour-basic.xml:668 msgid "" "We refer to the newest revision in the repository as the tip revision, or " "simply the tip." msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:679 +#: ../en/ch02-tour-basic.xml:675 msgid "Sharing changes" msgstr "共享修改" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:681 +#: ../en/ch02-tour-basic.xml:677 msgid "" "We mentioned earlier that repositories in Mercurial are self-contained. This " "means that the changeset we just created exists only in our <filename class=" @@ -3377,12 +3380,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:689 +#: ../en/ch02-tour-basic.xml:685 msgid "Pulling changes from another repository" msgstr "从其它版本库取得修改" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:690 +#: ../en/ch02-tour-basic.xml:686 msgid "" "To get started, let's clone our original <filename class=\"directory\">hello</" "filename> repository, which does not contain the change we just committed. " @@ -3391,7 +3394,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:698 +#: ../en/ch02-tour-basic.xml:694 msgid "" "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring " "changes from <filename class=\"directory\">my-hello</filename> into <filename " @@ -3404,7 +3407,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:711 +#: ../en/ch02-tour-basic.xml:707 msgid "" "(Of course, someone could cause more changesets to appear in the repository " "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get " @@ -3413,7 +3416,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:718 +#: ../en/ch02-tour-basic.xml:714 msgid "" "Bringing changes into a repository is a simple matter of running the <command " "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to " @@ -3421,7 +3424,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:725 +#: ../en/ch02-tour-basic.xml:721 msgid "" "As you can see from the before-and-after output of <command role=\"hg-cmd" "\">hg tip</command>, we have successfully pulled changes into our " @@ -3430,12 +3433,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:733 +#: ../en/ch02-tour-basic.xml:729 msgid "Updating the working directory" msgstr "更新工作目录" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:735 +#: ../en/ch02-tour-basic.xml:731 msgid "" "We have so far glossed over the relationship between a repository and its " "working directory. The <command role=\"hg-cmd\">hg pull</command> command " @@ -3447,7 +3450,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:747 +#: ../en/ch02-tour-basic.xml:743 msgid "" "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> " "doesn't update the working directory automatically. There's actually a good " @@ -3461,7 +3464,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:758 +#: ../en/ch02-tour-basic.xml:754 msgid "" "However, since pull-then-update is such a common thing to do, Mercurial lets " "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> " @@ -3469,7 +3472,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:763 +#: ../en/ch02-tour-basic.xml:759 msgid "" "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> " "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option " @@ -3479,14 +3482,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:772 +#: ../en/ch02-tour-basic.xml:768 msgid "" "To find out what revision the working directory is at, use the <command role=" "\"hg-cmd\">hg parents</command> command." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:778 +#: ../en/ch02-tour-basic.xml:774 msgid "" "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" " "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each " @@ -3497,7 +3500,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:788 +#: ../en/ch02-tour-basic.xml:784 msgid "" "To update the working directory to a particular revision, give a revision " "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> " @@ -3505,7 +3508,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:795 +#: ../en/ch02-tour-basic.xml:791 msgid "" "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</" "command> will update to the tip revision, as shown by the second call to " @@ -3513,12 +3516,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:803 +#: ../en/ch02-tour-basic.xml:799 msgid "Pushing changes to another repository" msgstr "发布修改到其它版本库" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:805 +#: ../en/ch02-tour-basic.xml:801 msgid "" "Mercurial lets us push changes to another repository, from the repository " "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg " @@ -3527,21 +3530,21 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:813 +#: ../en/ch02-tour-basic.xml:809 msgid "" "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what " "changes would be pushed into another repository." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:819 +#: ../en/ch02-tour-basic.xml:815 msgid "" "And the <command role=\"hg-cmd\">hg push</command> command does the actual " "push." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:825 +#: ../en/ch02-tour-basic.xml:821 msgid "" "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd" "\">hg push</command> command does not update the working directory in the " @@ -3552,19 +3555,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:834 +#: ../en/ch02-tour-basic.xml:830 msgid "" "What happens if we try to pull or push changes and the receiving repository " "already has those changes? Nothing too exciting." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:841 +#: ../en/ch02-tour-basic.xml:837 msgid "Sharing changes over a network" msgstr "通过网络共享修改" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:843 +#: ../en/ch02-tour-basic.xml:839 msgid "" "The commands we have covered in the previous few sections are not limited to " "working with local repositories. Each works in exactly the same fashion over " @@ -3572,7 +3575,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:851 +#: ../en/ch02-tour-basic.xml:847 msgid "" "In this example, we can see what changes we could push to the remote " "repository, but the repository is understandably not set up to let anonymous " @@ -15797,7 +15800,7 @@ msgstr "" # -#. &example.hg-interdiff; +#. &example.hg-interdiff; #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:465 msgid ""

# HG changeset patch # User Dongsheng Song # Date 1237377036 -28800 # Node ID c2cefd9f98935e6be338f36b4654d28ef856218f # Parent 1114da00d30e0d3e17e738a0625e1960b4cb802f Update Chinese translation diff -r 1114da00d30e -r c2cefd9f9893 po/zh.po --- a/po/zh.po Wed Mar 18 19:43:46 2009 +0800 +++ b/po/zh.po Wed Mar 18 19:50:36 2009 +0800 @@ -41,8 +41,8 @@ msgid "" msgstr "" "Project-Id-Version: hgbook 1.2\n" -"POT-Creation-Date: 2009-03-17 10:44+0800\n" -"PO-Revision-Date: 2009-03-18 18:12+0800\n" +"POT-Creation-Date: 2009-03-18 19:48+0800\n" +"PO-Revision-Date: 2009-03-18 19:50+0800\n" "Last-Translator: \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -2498,48 +2498,51 @@ msgstr "Debian:" #. type: Content of: -#: ../en/ch02-tour-basic.xml:35 +#: ../en/ch02-tour-basic.xml:34 msgid "Fedora Core:" msgstr "Fedora Core:" #. type: Content of: +#: ../en/ch02-tour-basic.xml:36 +msgid "Gentoo:" +msgstr "Gentoo:" + +#. type: Content of: #: ../en/ch02-tour-basic.xml:38 -msgid "Gentoo:" -msgstr "Gentoo:" +msgid "OpenSUSE:" +msgstr "OpenSUSE:" #. type: Content of: #: ../en/ch02-tour-basic.xml:40 -msgid "OpenSUSE:" -msgstr "OpenSUSE:" - -#. type: Content of: -#: ../en/ch02-tour-basic.xml:43 msgid "" "Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run " "the following command." -msgstr "" - -#. type: Content of: -#: ../en/ch02-tour-basic.xml:52 +msgstr "Ubuntu: Ubuntu 的 Mercurial 包基于 Debian。安装时，使用如下命令：" + +#. type: Content of: <book><chapter><sect1><sect2><title> +#: ../en/ch02-tour-basic.xml:48 msgid "Solaris" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:54 +msgstr "Solaris" + +#. type: Content of: <book><chapter><sect1><sect2><para> +#: ../en/ch02-tour-basic.xml:50 msgid "" "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." "sunfreeware.com</ulink>, is a good source for a large number of pre-built " "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including " "current versions of Mercurial." msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:62 +"位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" +"ulink> 的 SunFreeWare 是很好的二进制安装源，它包含 Intel 和 Sparc 架构的 32 位" +"和 64 位包，包含 Mercurial 的当前版本。" + +#. type: Content of: <book><chapter><sect1><sect2><title> +#: ../en/ch02-tour-basic.xml:58 msgid "Mac OS X" -msgstr "" - -#. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:64 +msgstr "Mac OS X" + +#. type: Content of: <book><chapter><sect1><sect2><para> +#: ../en/ch02-tour-basic.xml:60 msgid "" "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " @@ -2550,7 +2553,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:73 +#: ../en/ch02-tour-basic.xml:69 msgid "" "It's also possible to install Mercurial using Fink or MacPorts, two popular " "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-" @@ -2559,12 +2562,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:81 +#: ../en/ch02-tour-basic.xml:77 msgid "Windows" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:83 +#: ../en/ch02-tour-basic.xml:79 msgid "" "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url=" "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " @@ -2572,7 +2575,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><note><para> -#: ../en/ch02-tour-basic.xml:90 +#: ../en/ch02-tour-basic.xml:86 msgid "" "The Windows version of Mercurial does not automatically convert line endings " "between Windows and Unix styles. If you want to share work with Unix users, " @@ -2580,12 +2583,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:100 +#: ../en/ch02-tour-basic.xml:96 msgid "Getting started" msgstr "开始" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:102 +#: ../en/ch02-tour-basic.xml:98 msgid "" "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command " "to find out whether Mercurial is actually installed properly. The actual " @@ -2594,12 +2597,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:111 +#: ../en/ch02-tour-basic.xml:107 msgid "Built-in help" msgstr "内置帮助" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:113 +#: ../en/ch02-tour-basic.xml:109 msgid "" "Mercurial provides a built-in help system. This is invaluable for those " "times when you find yourself stuck trying to remember how to run a command. " @@ -2610,7 +2613,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:124 +#: ../en/ch02-tour-basic.xml:120 msgid "" "For a more impressive level of detail (which you won't usually need) run " "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></" @@ -2620,12 +2623,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:135 +#: ../en/ch02-tour-basic.xml:131 msgid "Working with a repository" msgstr "使用版本库" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:137 +#: ../en/ch02-tour-basic.xml:133 msgid "" "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. " "The repository for a project contains all of the files that <quote>belong to</" @@ -2633,7 +2636,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:143 +#: ../en/ch02-tour-basic.xml:139 msgid "" "There's nothing particularly magical about a repository; it is simply a " "directory tree in your filesystem that Mercurial treats as special. You can " @@ -2642,12 +2645,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:150 +#: ../en/ch02-tour-basic.xml:146 msgid "Making a local copy of a repository" msgstr "创建版本库的工作副本" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:152 +#: ../en/ch02-tour-basic.xml:148 msgid "" "<emphasis>Copying</emphasis> a repository is just a little bit special. " "While you could use a normal file copying command to make a copy of a " @@ -2657,21 +2660,21 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:161 +#: ../en/ch02-tour-basic.xml:157 msgid "" "If our clone succeeded, we should now have a local directory called <filename " "class=\"directory\">hello</filename>. This directory will contain some files." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:167 +#: ../en/ch02-tour-basic.xml:163 msgid "" "These files have the same contents and history in our repository as they do " "in the repository we cloned." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:170 +#: ../en/ch02-tour-basic.xml:166 msgid "" "Every Mercurial repository is complete, self-contained, and independent. It " "contains its own private copy of a project's files and history. A cloned " @@ -2681,7 +2684,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:177 +#: ../en/ch02-tour-basic.xml:173 msgid "" "What this means for now is that we're free to experiment with our repository, " "safe in the knowledge that it's a private <quote>sandbox</quote> that won't " @@ -2689,12 +2692,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:183 +#: ../en/ch02-tour-basic.xml:179 msgid "What's in a repository?" msgstr "什么是版本库?" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:185 +#: ../en/ch02-tour-basic.xml:181 msgid "" "When we take a more detailed look inside a repository, we can see that it " "contains a directory named <filename class=\"directory\">.hg</filename>. " @@ -2702,7 +2705,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:192 +#: ../en/ch02-tour-basic.xml:188 msgid "" "The contents of the <filename class=\"directory\">.hg</filename> directory " "and its subdirectories are private to Mercurial. Every other file and " @@ -2710,7 +2713,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:198 +#: ../en/ch02-tour-basic.xml:194 msgid "" "To introduce a little terminology, the <filename class=\"directory\">.hg</" "filename> directory is the <quote>real</quote> repository, and all of the " @@ -2723,12 +2726,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:213 +#: ../en/ch02-tour-basic.xml:209 msgid "A tour through history" msgstr "回溯历史" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:215 +#: ../en/ch02-tour-basic.xml:211 msgid "" "One of the first things we might want to do with a new, unfamiliar repository " "is understand its history. The <command role=\"hg-cmd\">hg log</command> " @@ -2736,7 +2739,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:222 +#: ../en/ch02-tour-basic.xml:218 msgid "" "By default, this command prints a brief paragraph of output for each change " "to the project that was recorded. In Mercurial terminology, we call each of " @@ -2745,14 +2748,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:228 +#: ../en/ch02-tour-basic.xml:224 msgid "" "The fields in a record of output from <command role=\"hg-cmd\">hg log</" "command> are as follows." msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:231 +#: ../en/ch02-tour-basic.xml:227 msgid "" "<literal>changeset</literal>: This field has the format of a number, followed " "by a colon, followed by a hexadecimal string. These are " @@ -2762,7 +2765,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:237 +#: ../en/ch02-tour-basic.xml:233 msgid "" "<literal>user</literal>: The identity of the person who created the " "changeset. This is a free-form field, but it most often contains a person's " @@ -2770,7 +2773,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:241 +#: ../en/ch02-tour-basic.xml:237 msgid "" "<literal>date</literal>: The date and time on which the changeset was " "created, and the timezone in which it was created. (The date and time are " @@ -2779,22 +2782,22 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:246 +#: ../en/ch02-tour-basic.xml:242 msgid "" "<literal>summary</literal>: The first line of the text message that the " "creator of the changeset entered to describe the changeset." msgstr "" #. type: Content of: <book><chapter><sect1><para> +#: ../en/ch02-tour-basic.xml:245 +msgid "" +"The default output printed by <command role=\"hg-cmd\">hg log</command> is " +"purely a summary; it is missing a lot of detail." +msgstr "" + +#. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:249 msgid "" -"The default output printed by <command role=\"hg-cmd\">hg log</command> is " -"purely a summary; it is missing a lot of detail." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:253 -msgid "" "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-" "basic.history\"/> provides a graphical representation of the history of the " "<filename class=\"directory\">hello</filename> repository, to make it a " @@ -2804,13 +2807,13 @@ msgstr "" #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject> -#: ../en/ch02-tour-basic.xml:264 +#: ../en/ch02-tour-basic.xml:260 msgid "" "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase> -#: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48 +#: ../en/ch02-tour-basic.xml:261 ../en/ch03-tour-merge.xml:48 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108 @@ -2824,19 +2827,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para> -#: ../en/ch02-tour-basic.xml:266 +#: ../en/ch02-tour-basic.xml:262 msgid "" "Graphical history of the <filename class=\"directory\">hello</filename> " "repository" msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:273 +#: ../en/ch02-tour-basic.xml:269 msgid "Changesets, revisions, and talking to other people" msgstr "改变集，版本，与其它用户交互" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:276 +#: ../en/ch02-tour-basic.xml:272 msgid "" "As English is a notoriously sloppy language, and computer science has a " "hallowed history of terminological confusion (why use one term when four will " @@ -2848,7 +2851,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:286 +#: ../en/ch02-tour-basic.xml:282 msgid "" "While it doesn't matter what <emphasis>word</emphasis> you use to refer to " "the concept of <quote>a changeset</quote>, the <emphasis>identifier</" @@ -2859,13 +2862,13 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:295 +#: ../en/ch02-tour-basic.xml:291 msgid "" "The revision number is <emphasis>only valid in that repository</emphasis>," msgstr "" #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:297 +#: ../en/ch02-tour-basic.xml:293 msgid "" "while the hex string is the <emphasis>permanent, unchanging identifier</" "emphasis> that will always identify that exact changeset in <emphasis>every</" @@ -2873,7 +2876,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:302 +#: ../en/ch02-tour-basic.xml:298 msgid "" "This distinction is important. If you send someone an email talking about " "<quote>revision 33</quote>, there's a high likelihood that their revision 33 " @@ -2885,7 +2888,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:312 +#: ../en/ch02-tour-basic.xml:308 msgid "" "Mercurial uses revision numbers purely as a convenient shorthand. If you " "need to discuss a changeset with someone, or make a record of a changeset for " @@ -2894,12 +2897,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:320 +#: ../en/ch02-tour-basic.xml:316 msgid "Viewing specific revisions" msgstr "察看指定版本" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:322 +#: ../en/ch02-tour-basic.xml:318 msgid "" "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a " "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option " @@ -2909,7 +2912,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:331 +#: ../en/ch02-tour-basic.xml:327 msgid "" "If you want to see the history of several revisions without having to list " "each one, you can use <emphasis>range notation</emphasis>; this lets you " @@ -2918,7 +2921,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:339 +#: ../en/ch02-tour-basic.xml:335 msgid "" "Mercurial also honours the order in which you specify revisions, so <command " "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command " @@ -2926,12 +2929,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:346 +#: ../en/ch02-tour-basic.xml:342 msgid "More detailed information" msgstr "更详细的信息" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:348 +#: ../en/ch02-tour-basic.xml:344 msgid "" "While the summary information printed by <command role=\"hg-cmd\">hg log</" "command> is useful if you already know what you're looking for, you may need " @@ -2943,7 +2946,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:360 +#: ../en/ch02-tour-basic.xml:356 msgid "" "If you want to see both the description and content of a change, add the " "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--" @@ -2953,12 +2956,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:373 +#: ../en/ch02-tour-basic.xml:369 msgid "All about command options" msgstr "命令选项" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:375 +#: ../en/ch02-tour-basic.xml:371 msgid "" "Let's take a brief break from exploring Mercurial commands to discuss a " "pattern in the way that they work; you may find this useful to keep in mind " @@ -2966,7 +2969,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:379 +#: ../en/ch02-tour-basic.xml:375 msgid "" "Mercurial has a consistent and straightforward approach to dealing with the " "options that you can pass to commands. It follows the conventions for " @@ -2974,16 +2977,16 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> +#: ../en/ch02-tour-basic.xml:380 +msgid "" +"Every option has a long name. For example, as we've already seen, the " +"<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" +"opt-log\">--rev</option> option." +msgstr "" + +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> #: ../en/ch02-tour-basic.xml:384 msgid "" -"Every option has a long name. For example, as we've already seen, the " -"<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" -"opt-log\">--rev</option> option." -msgstr "" - -#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:388 -msgid "" "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--" "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The " "reason that some options don't have short names is that the options in " @@ -2991,7 +2994,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:393 +#: ../en/ch02-tour-basic.xml:389 msgid "" "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</" "option>), while short options start with one (e.g. <option role=\"hg-opt-log" @@ -2999,7 +3002,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:397 +#: ../en/ch02-tour-basic.xml:393 msgid "" "Option naming and usage is consistent across commands. For example, every " "command that lets you specify a changeset ID or revision number accepts both " @@ -3008,7 +3011,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:403 +#: ../en/ch02-tour-basic.xml:399 msgid "" "In the examples throughout this book, I use short options instead of long. " "This just reflects my own preference, so don't read anything significant into " @@ -3016,7 +3019,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:407 +#: ../en/ch02-tour-basic.xml:403 msgid "" "Most commands that print output of some kind will print more output when " "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-" @@ -3025,20 +3028,20 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:415 +#: ../en/ch02-tour-basic.xml:411 msgid "Making and reviewing changes" msgstr "创建和复审修改" #. type: Content of: <book><chapter><sect1><para> +#: ../en/ch02-tour-basic.xml:413 +msgid "" +"Now that we have a grasp of viewing history in Mercurial, let's take a look " +"at making some changes and examining them." +msgstr "" + +#. type: Content of: <book><chapter><sect1><para> #: ../en/ch02-tour-basic.xml:417 msgid "" -"Now that we have a grasp of viewing history in Mercurial, let's take a look " -"at making some changes and examining them." -msgstr "" - -#. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:421 -msgid "" "The first thing we'll do is isolate our experiment in a repository of its " "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we " "don't need to clone a copy of the remote repository. Since we already have a " @@ -3048,7 +3051,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:431 +#: ../en/ch02-tour-basic.xml:427 msgid "" "As an aside, it's often good practice to keep a <quote>pristine</quote> copy " "of a remote repository around, which you can then make temporary clones of to " @@ -3060,7 +3063,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:440 +#: ../en/ch02-tour-basic.xml:436 msgid "" "In our <filename class=\"directory\">my-hello</filename> repository, we have " "a file <filename>hello.c</filename> that contains the classic <quote>hello, " @@ -3073,14 +3076,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:453 +#: ../en/ch02-tour-basic.xml:449 msgid "" "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us " "what Mercurial knows about the files in the repository." msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:459 +#: ../en/ch02-tour-basic.xml:455 msgid "" "The <command role=\"hg-cmd\">hg status</command> command prints no output for " "some files, but a line starting with <quote><literal>M</literal></quote> for " @@ -3090,7 +3093,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:466 +#: ../en/ch02-tour-basic.xml:462 msgid "" "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed " "that we modified <filename>hello.c</filename>. We didn't need to " @@ -3100,7 +3103,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:474 +#: ../en/ch02-tour-basic.xml:470 msgid "" "It's a little bit helpful to know that we've modified <filename>hello.c</" "filename>, but we might prefer to know exactly <emphasis>what</emphasis> " @@ -3109,12 +3112,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:484 +#: ../en/ch02-tour-basic.xml:480 msgid "Recording changes in a new changeset" msgstr "在新修改集中记录修改" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:486 +#: ../en/ch02-tour-basic.xml:482 msgid "" "We can modify files, build and test our changes, and use <command role=\"hg-" "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to " @@ -3123,7 +3126,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:493 +#: ../en/ch02-tour-basic.xml:489 msgid "" "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new " "changeset; we'll usually refer to this as <quote>making a commit</quote> or " @@ -3131,12 +3134,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:499 +#: ../en/ch02-tour-basic.xml:495 msgid "Setting up a username" msgstr "配置用户名称" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:501 +#: ../en/ch02-tour-basic.xml:497 msgid "" "When you try to run <command role=\"hg-cmd\">hg commit</command> for the " "first time, it is not guaranteed to succeed. Mercurial records your name and " @@ -3147,7 +3150,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:510 +#: ../en/ch02-tour-basic.xml:506 msgid "" "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the " "<command role=\"hg-cmd\">hg commit</command> command on the command line, " @@ -3155,14 +3158,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:515 +#: ../en/ch02-tour-basic.xml:511 msgid "" "If you have set the <envar>HGUSER</envar> environment variable, this is " "checked next." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:518 +#: ../en/ch02-tour-basic.xml:514 msgid "" "If you create a file in your home directory called <filename role=\"special" "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> " @@ -3171,14 +3174,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:525 +#: ../en/ch02-tour-basic.xml:521 msgid "" "If you have set the <envar>EMAIL</envar> environment variable, this will be " "used next." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> -#: ../en/ch02-tour-basic.xml:528 +#: ../en/ch02-tour-basic.xml:524 msgid "" "Mercurial will query your system to find out your local user name and host " "name, and construct a username from these components. Since this often " @@ -3187,7 +3190,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:535 +#: ../en/ch02-tour-basic.xml:531 msgid "" "If all of these mechanisms fail, Mercurial will fail, printing an error " "message. In this case, it will not let you commit until you set up a " @@ -3195,7 +3198,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:539 +#: ../en/ch02-tour-basic.xml:535 msgid "" "You should think of the <envar>HGUSER</envar> environment variable and the " "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-" @@ -3206,12 +3209,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><title> -#: ../en/ch02-tour-basic.xml:548 +#: ../en/ch02-tour-basic.xml:544 msgid "Creating a Mercurial configuration file" msgstr "创建 Mercurial 的配置文件" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:550 +#: ../en/ch02-tour-basic.xml:546 msgid "" "To set a user name, use your favourite editor to create a file called " "<filename role=\"special\">.hgrc</filename> in your home directory. " @@ -3221,7 +3224,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:561 +#: ../en/ch02-tour-basic.xml:557 msgid "" "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</" "emphasis> of the config file, so you can read the <quote><literal>username " @@ -3233,12 +3236,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><title> -#: ../en/ch02-tour-basic.xml:574 +#: ../en/ch02-tour-basic.xml:570 msgid "Choosing a user name" msgstr "选择用户名称" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> -#: ../en/ch02-tour-basic.xml:576 +#: ../en/ch02-tour-basic.xml:572 msgid "" "You can use any text you like as the value of the <literal>username</literal> " "config item, since this information is for reading by other people, but for " @@ -3247,7 +3250,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para> -#: ../en/ch02-tour-basic.xml:583 +#: ../en/ch02-tour-basic.xml:579 msgid "" "Mercurial's built-in web server obfuscates email addresses, to make it more " "difficult for the email harvesting tools that spammers use. This reduces the " @@ -3256,12 +3259,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:593 +#: ../en/ch02-tour-basic.xml:589 msgid "Writing a commit message" msgstr "写提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:595 +#: ../en/ch02-tour-basic.xml:591 msgid "" "When we commit a change, Mercurial drops us into a text editor, to enter a " "message that will describe the modifications we've made in this changeset. " @@ -3271,7 +3274,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:605 +#: ../en/ch02-tour-basic.xml:601 msgid "" "The editor that the <command role=\"hg-cmd\">hg commit</command> command " "drops us into will contain an empty line, followed by a number of lines " @@ -3279,7 +3282,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:612 +#: ../en/ch02-tour-basic.xml:608 msgid "" "Mercurial ignores the lines that start with <quote><literal>HG:</literal></" "quote>; it uses them only to tell us which files it's recording changes to. " @@ -3287,12 +3290,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:618 +#: ../en/ch02-tour-basic.xml:614 msgid "Writing a good commit message" msgstr "写好提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:620 +#: ../en/ch02-tour-basic.xml:616 msgid "" "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of " "a commit message by default, it's best to write a commit message whose first " @@ -3302,7 +3305,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:634 +#: ../en/ch02-tour-basic.xml:630 msgid "" "As far as the remainder of the contents of the commit message are concerned, " "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care " @@ -3311,7 +3314,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:640 +#: ../en/ch02-tour-basic.xml:636 msgid "" "My personal preference is for short, but informative, commit messages that " "tell me something that I can't figure out with a quick glance at the output " @@ -3319,12 +3322,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:647 +#: ../en/ch02-tour-basic.xml:643 msgid "Aborting a commit" msgstr "终止提交" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:649 +#: ../en/ch02-tour-basic.xml:645 msgid "" "If you decide that you don't want to commit while in the middle of editing a " "commit message, simply exit from your editor without saving the file that " @@ -3333,7 +3336,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:654 +#: ../en/ch02-tour-basic.xml:650 msgid "" "If we run the <command role=\"hg-cmd\">hg commit</command> command without " "any arguments, it records all of the changes we've made, as reported by " @@ -3342,12 +3345,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:661 +#: ../en/ch02-tour-basic.xml:657 msgid "Admiring our new handiwork" msgstr "欣赏我们的新手艺" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:663 +#: ../en/ch02-tour-basic.xml:659 msgid "" "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg " "tip</command> command to display the changeset we just created. This command " @@ -3356,19 +3359,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:672 +#: ../en/ch02-tour-basic.xml:668 msgid "" "We refer to the newest revision in the repository as the tip revision, or " "simply the tip." msgstr "" #. type: Content of: <book><chapter><sect1><title> -#: ../en/ch02-tour-basic.xml:679 +#: ../en/ch02-tour-basic.xml:675 msgid "Sharing changes" msgstr "共享修改" #. type: Content of: <book><chapter><sect1><para> -#: ../en/ch02-tour-basic.xml:681 +#: ../en/ch02-tour-basic.xml:677 msgid "" "We mentioned earlier that repositories in Mercurial are self-contained. This " "means that the changeset we just created exists only in our <filename class=" @@ -3377,12 +3380,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:689 +#: ../en/ch02-tour-basic.xml:685 msgid "Pulling changes from another repository" msgstr "从其它版本库取得修改" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:690 +#: ../en/ch02-tour-basic.xml:686 msgid "" "To get started, let's clone our original <filename class=\"directory\">hello</" "filename> repository, which does not contain the change we just committed. " @@ -3391,7 +3394,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:698 +#: ../en/ch02-tour-basic.xml:694 msgid "" "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring " "changes from <filename class=\"directory\">my-hello</filename> into <filename " @@ -3404,7 +3407,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:711 +#: ../en/ch02-tour-basic.xml:707 msgid "" "(Of course, someone could cause more changesets to appear in the repository " "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get " @@ -3413,7 +3416,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:718 +#: ../en/ch02-tour-basic.xml:714 msgid "" "Bringing changes into a repository is a simple matter of running the <command " "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to " @@ -3421,7 +3424,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:725 +#: ../en/ch02-tour-basic.xml:721 msgid "" "As you can see from the before-and-after output of <command role=\"hg-cmd" "\">hg tip</command>, we have successfully pulled changes into our " @@ -3430,12 +3433,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:733 +#: ../en/ch02-tour-basic.xml:729 msgid "Updating the working directory" msgstr "更新工作目录" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:735 +#: ../en/ch02-tour-basic.xml:731 msgid "" "We have so far glossed over the relationship between a repository and its " "working directory. The <command role=\"hg-cmd\">hg pull</command> command " @@ -3447,7 +3450,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:747 +#: ../en/ch02-tour-basic.xml:743 msgid "" "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> " "doesn't update the working directory automatically. There's actually a good " @@ -3461,7 +3464,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:758 +#: ../en/ch02-tour-basic.xml:754 msgid "" "However, since pull-then-update is such a common thing to do, Mercurial lets " "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> " @@ -3469,7 +3472,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:763 +#: ../en/ch02-tour-basic.xml:759 msgid "" "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> " "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option " @@ -3479,14 +3482,14 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:772 +#: ../en/ch02-tour-basic.xml:768 msgid "" "To find out what revision the working directory is at, use the <command role=" "\"hg-cmd\">hg parents</command> command." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:778 +#: ../en/ch02-tour-basic.xml:774 msgid "" "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" " "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each " @@ -3497,7 +3500,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:788 +#: ../en/ch02-tour-basic.xml:784 msgid "" "To update the working directory to a particular revision, give a revision " "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> " @@ -3505,7 +3508,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:795 +#: ../en/ch02-tour-basic.xml:791 msgid "" "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</" "command> will update to the tip revision, as shown by the second call to " @@ -3513,12 +3516,12 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:803 +#: ../en/ch02-tour-basic.xml:799 msgid "Pushing changes to another repository" msgstr "发布修改到其它版本库" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:805 +#: ../en/ch02-tour-basic.xml:801 msgid "" "Mercurial lets us push changes to another repository, from the repository " "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg " @@ -3527,21 +3530,21 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:813 +#: ../en/ch02-tour-basic.xml:809 msgid "" "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what " "changes would be pushed into another repository." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:819 +#: ../en/ch02-tour-basic.xml:815 msgid "" "And the <command role=\"hg-cmd\">hg push</command> command does the actual " "push." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:825 +#: ../en/ch02-tour-basic.xml:821 msgid "" "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd" "\">hg push</command> command does not update the working directory in the " @@ -3552,19 +3555,19 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:834 +#: ../en/ch02-tour-basic.xml:830 msgid "" "What happens if we try to pull or push changes and the receiving repository " "already has those changes? Nothing too exciting." msgstr "" #. type: Content of: <book><chapter><sect1><sect2><title> -#: ../en/ch02-tour-basic.xml:841 +#: ../en/ch02-tour-basic.xml:837 msgid "Sharing changes over a network" msgstr "通过网络共享修改" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:843 +#: ../en/ch02-tour-basic.xml:839 msgid "" "The commands we have covered in the previous few sections are not limited to " "working with local repositories. Each works in exactly the same fashion over " @@ -3572,7 +3575,7 @@ msgstr "" #. type: Content of: <book><chapter><sect1><sect2><para> -#: ../en/ch02-tour-basic.xml:851 +#: ../en/ch02-tour-basic.xml:847 msgid "" "In this example, we can see what changes we could push to the remote " "repository, but the repository is understandably not set up to let anonymous " @@ -15797,7 +15800,7 @@ msgstr "" # -#. &example.hg-interdiff; +#. &example.hg-interdiff; #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:465 msgid ""