hgbook
diff po/zh.po @ 667:3b33dd6aba87
Merge with http://hg.serpentine.com/mercurial/book
author | Dongsheng Song <songdongsheng@live.cn> |
---|---|
date | Thu Apr 02 09:24:36 2009 +0800 (2009-04-02) |
parents | 53f179393f5c |
children | 55e2953f82d6 |
line diff
1.1 --- a/po/zh.po Tue Mar 31 14:54:24 2009 +0800 1.2 +++ b/po/zh.po Thu Apr 02 09:24:36 2009 +0800 1.3 @@ -41,7 +41,7 @@ 1.4 msgid "" 1.5 msgstr "" 1.6 "Project-Id-Version: hgbook 1.2\n" 1.7 -"POT-Creation-Date: 2009-03-31 10:46+0800\n" 1.8 +"POT-Creation-Date: 2009-04-02 09:21+0800\n" 1.9 "PO-Revision-Date: 2009-03-31 10:12+0800\n" 1.10 "Last-Translator: \n" 1.11 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.12 @@ -62,18 +62,23 @@ 1.13 msgid "Compiled from $rev_id$" 1.14 msgstr "编译自 $rev_id$" 1.15 1.16 +#. type: Content of: <book><bookinfo> 1.17 +#: ../en/00book.xml:48 1.18 +msgid "<edition>1</edition> <isbn>9780596800673</isbn>" 1.19 +msgstr "" 1.20 + 1.21 #. type: Content of: <book><bookinfo><authorgroup><author><firstname> 1.22 -#: ../en/00book.xml:50 1.23 +#: ../en/00book.xml:52 1.24 msgid "Bryan" 1.25 msgstr "Bryan" 1.26 1.27 #. type: Content of: <book><bookinfo><authorgroup><author><surname> 1.28 -#: ../en/00book.xml:51 1.29 +#: ../en/00book.xml:53 1.30 msgid "O'Sullivan" 1.31 msgstr "O'Sullivan" 1.32 1.33 #. type: Content of: <book><bookinfo> 1.34 -#: ../en/00book.xml:55 1.35 +#: ../en/00book.xml:57 1.36 msgid "" 1.37 "<editor> <firstname>Mike</firstname> <surname>Loukides</surname> </editor> " 1.38 "<copyright> <year>2006</year> <year>2007</year> <year>2008</year> <year>2009</" 1.39 @@ -436,6 +441,7 @@ 1.40 1.41 #. type: Content of: <book><appendix><sect1><sect2><title> 1.42 #: ../en/appB-mq-ref.xml:14 1.43 +#, fuzzy 1.44 msgid "<command role=\"hg-ext-mq\">qapplied</command>—print applied patches" 1.45 msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁" 1.46 1.47 @@ -449,6 +455,7 @@ 1.48 1.49 #. type: Content of: <book><appendix><sect1><sect2><title> 1.50 #: ../en/appB-mq-ref.xml:24 1.51 +#, fuzzy 1.52 msgid "" 1.53 "<command role=\"hg-ext-mq\">qcommit</command>—commit changes in the queue " 1.54 "repository" 1.55 @@ -476,6 +483,7 @@ 1.56 1.57 #. type: Content of: <book><appendix><sect1><sect2><title> 1.58 #: ../en/appB-mq-ref.xml:43 1.59 +#, fuzzy 1.60 msgid "" 1.61 "<command role=\"hg-ext-mq\">qdelete</command>—delete a patch from the " 1.62 "<filename role=\"special\">series</filename> file" 1.63 @@ -510,6 +518,7 @@ 1.64 1.65 #. type: Content of: <book><appendix><sect1><sect2><title> 1.66 #: ../en/appB-mq-ref.xml:66 1.67 +#, fuzzy 1.68 msgid "" 1.69 "<command role=\"hg-ext-mq\">qdiff</command>—print a diff of the topmost " 1.70 "applied patch" 1.71 @@ -525,6 +534,7 @@ 1.72 1.73 #. type: Content of: <book><appendix><sect1><sect2><title> 1.74 #: ../en/appB-mq-ref.xml:75 1.75 +#, fuzzy 1.76 msgid "" 1.77 "<command role=\"hg-ext-mq\">qfold</command>—merge (<quote>fold</quote>) " 1.78 "several patches into one" 1.79 @@ -584,6 +594,7 @@ 1.80 1.81 #. type: Content of: <book><appendix><sect1><sect2><title> 1.82 #: ../en/appB-mq-ref.xml:119 1.83 +#, fuzzy 1.84 msgid "" 1.85 "<command role=\"hg-ext-mq\">qheader</command>—display the header/description " 1.86 "of a patch" 1.87 @@ -599,6 +610,7 @@ 1.88 1.89 #. type: Content of: <book><appendix><sect1><sect2><title> 1.90 #: ../en/appB-mq-ref.xml:130 1.91 +#, fuzzy 1.92 msgid "" 1.93 "<command role=\"hg-ext-mq\">qimport</command>—import a third-party patch into " 1.94 "the queue" 1.95 @@ -625,6 +637,7 @@ 1.96 1.97 #. type: Content of: <book><appendix><sect1><sect2><title> 1.98 #: ../en/appB-mq-ref.xml:149 1.99 +#, fuzzy 1.100 msgid "" 1.101 "<command role=\"hg-ext-mq\">qinit</command>—prepare a repository to work with " 1.102 "MQ" 1.103 @@ -658,6 +671,7 @@ 1.104 1.105 #. type: Content of: <book><appendix><sect1><sect2><title> 1.106 #: ../en/appB-mq-ref.xml:178 1.107 +#, fuzzy 1.108 msgid "<command role=\"hg-ext-mq\">qnew</command>—create a new patch" 1.109 msgstr "<command role=\"hg-ext-mq\">qnew</command>—创建新补丁" 1.110 1.111 @@ -700,6 +714,7 @@ 1.112 1.113 #. type: Content of: <book><appendix><sect1><sect2><title> 1.114 #: ../en/appB-mq-ref.xml:215 1.115 +#, fuzzy 1.116 msgid "" 1.117 "<command role=\"hg-ext-mq\">qnext</command>—print the name of the next patch" 1.118 msgstr "<command role=\"hg-ext-mq\">qnext</command>—显示下个补丁的名称" 1.119 @@ -715,6 +730,7 @@ 1.120 1.121 #. type: Content of: <book><appendix><sect1><sect2><title> 1.122 #: ../en/appB-mq-ref.xml:227 1.123 +#, fuzzy 1.124 msgid "<command role=\"hg-ext-mq\">qpop</command>—pop patches off the stack" 1.125 msgstr "<command role=\"hg-ext-mq\">qpop</command>—删除堆栈顶部的补丁" 1.126 1.127 @@ -798,6 +814,7 @@ 1.128 1.129 #. type: Content of: <book><appendix><sect1><sect2><title> 1.130 #: ../en/appB-mq-ref.xml:288 1.131 +#, fuzzy 1.132 msgid "" 1.133 "<command role=\"hg-ext-mq\">qprev</command>—print the name of the previous " 1.134 "patch" 1.135 @@ -814,6 +831,7 @@ 1.136 1.137 #. type: Content of: <book><appendix><sect1><sect2><title> 1.138 #: ../en/appB-mq-ref.xml:300 1.139 +#, fuzzy 1.140 msgid "<command role=\"hg-ext-mq\">qpush</command>—push patches onto the stack" 1.141 msgstr "<command role=\"hg-ext-mq\">qpush</command>—增加补丁到堆栈" 1.142 1.143 @@ -911,6 +929,7 @@ 1.144 1.145 #. type: Content of: <book><appendix><sect1><sect2><title> 1.146 #: ../en/appB-mq-ref.xml:368 1.147 +#, fuzzy 1.148 msgid "" 1.149 "<command role=\"hg-ext-mq\">qrefresh</command>—update the topmost applied " 1.150 "patch" 1.151 @@ -988,6 +1007,7 @@ 1.152 1.153 #. type: Content of: <book><appendix><sect1><sect2><title> 1.154 #: ../en/appB-mq-ref.xml:424 1.155 +#, fuzzy 1.156 msgid "<command role=\"hg-ext-mq\">qrename</command>—rename a patch" 1.157 msgstr "<command role=\"hg-ext-mq\">qrename</command>—改名补丁" 1.158 1.159 @@ -1009,6 +1029,7 @@ 1.160 1.161 #. type: Content of: <book><appendix><sect1><sect2><title> 1.162 #: ../en/appB-mq-ref.xml:438 1.163 +#, fuzzy 1.164 msgid "<command role=\"hg-ext-mq\">qrestore</command>—restore saved queue state" 1.165 msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列" 1.166 1.167 @@ -1019,6 +1040,7 @@ 1.168 1.169 #. type: Content of: <book><appendix><sect1><sect2><title> 1.170 #: ../en/appB-mq-ref.xml:446 1.171 +#, fuzzy 1.172 msgid "<command role=\"hg-ext-mq\">qsave</command>—save current queue state" 1.173 msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态" 1.174 1.175 @@ -1029,6 +1051,7 @@ 1.176 1.177 #. type: Content of: <book><appendix><sect1><sect2><title> 1.178 #: ../en/appB-mq-ref.xml:453 1.179 +#, fuzzy 1.180 msgid "" 1.181 "<command role=\"hg-ext-mq\">qseries</command>—print the entire patch series" 1.182 msgstr "<command role=\"hg-ext-mq\">qseries</command>—显示补丁序列" 1.183 @@ -1044,6 +1067,7 @@ 1.184 1.185 #. type: Content of: <book><appendix><sect1><sect2><title> 1.186 #: ../en/appB-mq-ref.xml:464 1.187 +#, fuzzy 1.188 msgid "" 1.189 "<command role=\"hg-ext-mq\">qtop</command>—print the name of the current patch" 1.190 msgstr "<command role=\"hg-ext-mq\">qtop</command>—显示当前补丁的名称" 1.191 @@ -1057,6 +1081,7 @@ 1.192 1.193 #. type: Content of: <book><appendix><sect1><sect2><title> 1.194 #: ../en/appB-mq-ref.xml:472 1.195 +#, fuzzy 1.196 msgid "" 1.197 "<command role=\"hg-ext-mq\">qunapplied</command>—print patches not yet applied" 1.198 msgstr "<command role=\"hg-ext-mq\">qunapplied</command>—显示尚未应用的补丁" 1.199 @@ -1072,6 +1097,7 @@ 1.200 1.201 #. type: Content of: <book><appendix><sect1><sect2><title> 1.202 #: ../en/appB-mq-ref.xml:484 1.203 +#, fuzzy 1.204 msgid "" 1.205 "<command role=\"hg-cmd\">hg strip</command>—remove a revision and descendants" 1.206 msgstr "<command role=\"hg-cmd\">hg strip</command>—删除一个版本及其后继" 1.207 @@ -1606,12 +1632,12 @@ 1.208 #. type: Content of: <book><preface><sect1><sect2><para> 1.209 #: ../en/ch00-preface.xml:71 1.210 msgid "" 1.211 -"Most of these reasons are equally valid---at least in theory---whether you're " 1.212 -"working on a project by yourself, or with a hundred other people." 1.213 +"Most of these reasons are equally valid—at least in theory&emdash;whether " 1.214 +"you're working on a project by yourself, or with a hundred other people." 1.215 msgstr "" 1.216 1.217 #. type: Content of: <book><preface><sect1><sect2><para> 1.218 -#: ../en/ch00-preface.xml:75 1.219 +#: ../en/ch00-preface.xml:76 1.220 msgid "" 1.221 "A key question about the practicality of revision control at these two " 1.222 "different scales (<quote>lone hacker</quote> and <quote>huge team</quote>) is " 1.223 @@ -1621,7 +1647,7 @@ 1.224 msgstr "" 1.225 1.226 #. type: Content of: <book><preface><sect1><sect2><para> 1.227 -#: ../en/ch00-preface.xml:83 1.228 +#: ../en/ch00-preface.xml:84 1.229 msgid "" 1.230 "A five-hundred-person project is likely to collapse under its own weight " 1.231 "almost immediately without a revision control tool and process. In this case, " 1.232 @@ -1630,7 +1656,7 @@ 1.233 msgstr "" 1.234 1.235 #. type: Content of: <book><preface><sect1><sect2><para> 1.236 -#: ../en/ch00-preface.xml:90 1.237 +#: ../en/ch00-preface.xml:91 1.238 msgid "" 1.239 "On the other hand, a one-person <quote>quick hack</quote> might seem like a " 1.240 "poor place to use a revision control tool, because surely the cost of using " 1.241 @@ -1638,7 +1664,7 @@ 1.242 msgstr "" 1.243 1.244 #. type: Content of: <book><preface><sect1><sect2><para> 1.245 -#: ../en/ch00-preface.xml:95 1.246 +#: ../en/ch00-preface.xml:96 1.247 msgid "" 1.248 "Mercurial uniquely supports <emphasis>both</emphasis> of these scales of " 1.249 "development. You can learn the basics in just a few minutes, and due to its " 1.250 @@ -1651,7 +1677,7 @@ 1.251 msgstr "" 1.252 1.253 #. type: Content of: <book><preface><sect1><sect2><para> 1.254 -#: ../en/ch00-preface.xml:105 1.255 +#: ../en/ch00-preface.xml:106 1.256 msgid "" 1.257 "No revision control tool can rescue a poorly run project, but a good choice " 1.258 "of tools can make a huge difference to the fluidity with which you can work " 1.259 @@ -1659,12 +1685,12 @@ 1.260 msgstr "" 1.261 1.262 #. type: Content of: <book><preface><sect1><sect2><title> 1.263 -#: ../en/ch00-preface.xml:112 1.264 +#: ../en/ch00-preface.xml:113 1.265 msgid "The many names of revision control" 1.266 msgstr "版本控制的别名" 1.267 1.268 #. type: Content of: <book><preface><sect1><sect2><para> 1.269 -#: ../en/ch00-preface.xml:114 1.270 +#: ../en/ch00-preface.xml:115 1.271 msgid "" 1.272 "Revision control is a diverse field, so much so that it is referred to by " 1.273 "many names and acronyms. Here are a few of the more common variations you'll " 1.274 @@ -1672,32 +1698,32 @@ 1.275 msgstr "" 1.276 1.277 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para> 1.278 -#: ../en/ch00-preface.xml:118 1.279 +#: ../en/ch00-preface.xml:119 1.280 msgid "Revision control (RCS)" 1.281 msgstr "版本控制(RCS)" 1.282 1.283 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para> 1.284 -#: ../en/ch00-preface.xml:119 1.285 +#: ../en/ch00-preface.xml:120 1.286 msgid "Software configuration management (SCM), or configuration management" 1.287 msgstr "软件配置管理(SCM),或配置管理" 1.288 1.289 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para> 1.290 -#: ../en/ch00-preface.xml:121 1.291 +#: ../en/ch00-preface.xml:122 1.292 msgid "Source code management" 1.293 msgstr "源代码管理" 1.294 1.295 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para> 1.296 -#: ../en/ch00-preface.xml:122 1.297 +#: ../en/ch00-preface.xml:123 1.298 msgid "Source code control, or source control" 1.299 msgstr "源代码控制,或源控制" 1.300 1.301 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para> 1.302 -#: ../en/ch00-preface.xml:124 1.303 +#: ../en/ch00-preface.xml:125 1.304 msgid "Version control (VCS)" 1.305 msgstr "版本控制(VCS)" 1.306 1.307 #. type: Content of: <book><preface><sect1><sect2><para> 1.308 -#: ../en/ch00-preface.xml:126 1.309 +#: ../en/ch00-preface.xml:127 1.310 msgid "" 1.311 "Some people claim that these terms actually have different meanings, but in " 1.312 "practice they overlap so much that there's no agreed or even useful way to " 1.313 @@ -1705,12 +1731,12 @@ 1.314 msgstr "" 1.315 1.316 #. type: Content of: <book><preface><sect1><title> 1.317 -#: ../en/ch00-preface.xml:134 1.318 +#: ../en/ch00-preface.xml:135 1.319 msgid "This book is a work in progress" 1.320 msgstr "本书正在编写中" 1.321 1.322 #. type: Content of: <book><preface><sect1><para> 1.323 -#: ../en/ch00-preface.xml:136 1.324 +#: ../en/ch00-preface.xml:137 1.325 msgid "" 1.326 "I am releasing this book while I am still writing it, in the hope that it " 1.327 "will prove useful to others. I am writing under an open license in the hope " 1.328 @@ -1719,22 +1745,22 @@ 1.329 msgstr "" 1.330 1.331 #. type: Content of: <book><preface><sect1><title> 1.332 -#: ../en/ch00-preface.xml:143 1.333 +#: ../en/ch00-preface.xml:144 1.334 msgid "About the examples in this book" 1.335 msgstr "本书的例子" 1.336 1.337 #. type: Content of: <book><preface><sect1><para> 1.338 -#: ../en/ch00-preface.xml:145 1.339 +#: ../en/ch00-preface.xml:146 1.340 msgid "" 1.341 "This book takes an unusual approach to code samples. Every example is " 1.342 -"<quote>live</quote>---each one is actually the result of a shell script that " 1.343 +"<quote>live</quote>—each one is actually the result of a shell script that " 1.344 "executes the Mercurial commands you see. Every time an image of the book is " 1.345 "built from its sources, all the example scripts are automatically run, and " 1.346 "their current results compared against their expected results." 1.347 msgstr "" 1.348 1.349 #. type: Content of: <book><preface><sect1><para> 1.350 -#: ../en/ch00-preface.xml:152 1.351 +#: ../en/ch00-preface.xml:153 1.352 msgid "" 1.353 "The advantage of this approach is that the examples are always accurate; they " 1.354 "describe <emphasis>exactly</emphasis> the behaviour of the version of " 1.355 @@ -1744,7 +1770,7 @@ 1.356 msgstr "" 1.357 1.358 #. type: Content of: <book><preface><sect1><para> 1.359 -#: ../en/ch00-preface.xml:159 1.360 +#: ../en/ch00-preface.xml:160 1.361 msgid "" 1.362 "There is a small disadvantage to this approach, which is that the dates and " 1.363 "times you'll see in examples tend to be <quote>squashed</quote> together in a " 1.364 @@ -1755,7 +1781,7 @@ 1.365 msgstr "" 1.366 1.367 #. type: Content of: <book><preface><sect1><para> 1.368 -#: ../en/ch00-preface.xml:167 1.369 +#: ../en/ch00-preface.xml:168 1.370 msgid "" 1.371 "As an instance of this, several consecutive commits in an example can show up " 1.372 "as having occurred during the same second. You can see this occur in the " 1.373 @@ -1764,7 +1790,7 @@ 1.374 msgstr "" 1.375 1.376 #. type: Content of: <book><preface><sect1><para> 1.377 -#: ../en/ch00-preface.xml:173 1.378 +#: ../en/ch00-preface.xml:174 1.379 msgid "" 1.380 "So when you're reading examples, don't place too much weight on the dates or " 1.381 "times you see in the output of commands. But <emphasis>do</emphasis> be " 1.382 @@ -1772,12 +1798,12 @@ 1.383 msgstr "" 1.384 1.385 #. type: Content of: <book><preface><sect1><title> 1.386 -#: ../en/ch00-preface.xml:181 1.387 +#: ../en/ch00-preface.xml:182 1.388 msgid "Trends in the field" 1.389 msgstr "版本控制的发展趋势" 1.390 1.391 #. type: Content of: <book><preface><sect1><para> 1.392 -#: ../en/ch00-preface.xml:183 1.393 +#: ../en/ch00-preface.xml:184 1.394 msgid "" 1.395 "There has been an unmistakable trend in the development and use of revision " 1.396 "control tools over the past four decades, as people have become familiar with " 1.397 @@ -1785,7 +1811,7 @@ 1.398 msgstr "" 1.399 1.400 #. type: Content of: <book><preface><sect1><para> 1.401 -#: ../en/ch00-preface.xml:188 1.402 +#: ../en/ch00-preface.xml:189 1.403 msgid "" 1.404 "The first generation began by managing single files on individual computers. " 1.405 "Although these tools represented a huge advance over ad-hoc manual revision " 1.406 @@ -1794,7 +1820,7 @@ 1.407 msgstr "" 1.408 1.409 #. type: Content of: <book><preface><sect1><para> 1.410 -#: ../en/ch00-preface.xml:194 1.411 +#: ../en/ch00-preface.xml:195 1.412 msgid "" 1.413 "The second generation loosened these constraints by moving to network-" 1.414 "centered architectures, and managing entire projects at a time. As projects " 1.415 @@ -1808,7 +1834,7 @@ 1.416 msgstr "" 1.417 1.418 #. type: Content of: <book><preface><sect1><para> 1.419 -#: ../en/ch00-preface.xml:206 1.420 +#: ../en/ch00-preface.xml:207 1.421 msgid "" 1.422 "The current generation of revision control tools is peer-to-peer in nature. " 1.423 "All of these systems have dropped the dependency on a single central server, " 1.424 @@ -1820,12 +1846,12 @@ 1.425 msgstr "" 1.426 1.427 #. type: Content of: <book><preface><sect1><title> 1.428 -#: ../en/ch00-preface.xml:218 1.429 +#: ../en/ch00-preface.xml:219 1.430 msgid "A few of the advantages of distributed revision control" 1.431 msgstr "分布版本控制的优点" 1.432 1.433 #. type: Content of: <book><preface><sect1><para> 1.434 -#: ../en/ch00-preface.xml:221 1.435 +#: ../en/ch00-preface.xml:222 1.436 msgid "" 1.437 "Even though distributed revision control tools have for several years been as " 1.438 "robust and usable as their previous-generation counterparts, people using " 1.439 @@ -1835,7 +1861,7 @@ 1.440 msgstr "" 1.441 1.442 #. type: Content of: <book><preface><sect1><para> 1.443 -#: ../en/ch00-preface.xml:228 1.444 +#: ../en/ch00-preface.xml:229 1.445 msgid "" 1.446 "For an individual developer, distributed tools are almost always much faster " 1.447 "than centralised tools. This is for a simple reason: a centralised tool " 1.448 @@ -1848,7 +1874,7 @@ 1.449 msgstr "" 1.450 1.451 #. type: Content of: <book><preface><sect1><para> 1.452 -#: ../en/ch00-preface.xml:239 1.453 +#: ../en/ch00-preface.xml:240 1.454 msgid "" 1.455 "Distributed tools are indifferent to the vagaries of your server " 1.456 "infrastructure, again because they replicate metadata to so many locations. " 1.457 @@ -1859,7 +1885,7 @@ 1.458 msgstr "" 1.459 1.460 #. type: Content of: <book><preface><sect1><para> 1.461 -#: ../en/ch00-preface.xml:247 1.462 +#: ../en/ch00-preface.xml:248 1.463 msgid "" 1.464 "The reliability of your network will affect distributed tools far less than " 1.465 "it will centralised tools. You can't even use a centralised tool without a " 1.466 @@ -1872,12 +1898,12 @@ 1.467 msgstr "" 1.468 1.469 #. type: Content of: <book><preface><sect1><sect2><title> 1.470 -#: ../en/ch00-preface.xml:258 1.471 +#: ../en/ch00-preface.xml:259 1.472 msgid "Advantages for open source projects" 1.473 msgstr "开源项目的优点" 1.474 1.475 #. type: Content of: <book><preface><sect1><sect2><para> 1.476 -#: ../en/ch00-preface.xml:260 1.477 +#: ../en/ch00-preface.xml:261 1.478 msgid "" 1.479 "If you take a shine to an open source project and decide that you would like " 1.480 "to start hacking on it, and that project uses a distributed revision control " 1.481 @@ -1893,12 +1919,12 @@ 1.482 msgstr "" 1.483 1.484 #. type: Content of: <book><preface><sect1><sect2><sect3><title> 1.485 -#: ../en/ch00-preface.xml:276 1.486 +#: ../en/ch00-preface.xml:277 1.487 msgid "The forking non-problem" 1.488 msgstr "分叉不是问题" 1.489 1.490 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.491 -#: ../en/ch00-preface.xml:278 1.492 +#: ../en/ch00-preface.xml:279 1.493 msgid "" 1.494 "It has been suggested that distributed revision control tools pose some sort " 1.495 "of risk to open source projects because they make it easy to <quote>fork</" 1.496 @@ -1910,7 +1936,7 @@ 1.497 msgstr "" 1.498 1.499 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.500 -#: ../en/ch00-preface.xml:288 1.501 +#: ../en/ch00-preface.xml:289 1.502 msgid "" 1.503 "Sometimes the camps in a fork decide to reconcile their differences. With a " 1.504 "centralised revision control system, the <emphasis>technical</emphasis> " 1.505 @@ -1921,7 +1947,7 @@ 1.506 msgstr "" 1.507 1.508 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.509 -#: ../en/ch00-preface.xml:297 1.510 +#: ../en/ch00-preface.xml:298 1.511 msgid "" 1.512 "What distributed tools do with respect to forking is they make forking the " 1.513 "<emphasis>only</emphasis> way to develop a project. Every single change that " 1.514 @@ -1932,7 +1958,7 @@ 1.515 msgstr "" 1.516 1.517 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.518 -#: ../en/ch00-preface.xml:306 1.519 +#: ../en/ch00-preface.xml:307 1.520 msgid "" 1.521 "If every piece of work that everybody does, all the time, is framed in terms " 1.522 "of forking and merging, then what the open source world refers to as a " 1.523 @@ -1942,14 +1968,14 @@ 1.524 msgstr "" 1.525 1.526 #. type: Content of: <book><preface><sect1><sect2><sect3><itemizedlist><listitem><para> 1.527 -#: ../en/ch00-preface.xml:313 1.528 +#: ../en/ch00-preface.xml:314 1.529 msgid "" 1.530 "They eliminate the social distinction that centralised tools impose: that " 1.531 "between insiders (people with commit access) and outsiders (people without)." 1.532 msgstr "" 1.533 1.534 #. type: Content of: <book><preface><sect1><sect2><sect3><itemizedlist><listitem><para> 1.535 -#: ../en/ch00-preface.xml:317 1.536 +#: ../en/ch00-preface.xml:318 1.537 msgid "" 1.538 "They make it easier to reconcile after a social fork, because all that's " 1.539 "involved from the perspective of the revision control software is just " 1.540 @@ -1957,7 +1983,7 @@ 1.541 msgstr "" 1.542 1.543 #. type: Content of: <book><preface><sect1><sect2><sect3><para> 1.544 -#: ../en/ch00-preface.xml:322 1.545 +#: ../en/ch00-preface.xml:323 1.546 msgid "" 1.547 "Some people resist distributed tools because they want to retain tight " 1.548 "control over their projects, and they believe that centralised tools give " 1.549 @@ -1970,12 +1996,12 @@ 1.550 msgstr "" 1.551 1.552 #. type: Content of: <book><preface><sect1><sect2><title> 1.553 -#: ../en/ch00-preface.xml:337 1.554 +#: ../en/ch00-preface.xml:338 1.555 msgid "Advantages for commercial projects" 1.556 msgstr "商业项目的优点" 1.557 1.558 #. type: Content of: <book><preface><sect1><sect2><para> 1.559 -#: ../en/ch00-preface.xml:339 1.560 +#: ../en/ch00-preface.xml:340 1.561 msgid "" 1.562 "Many commercial projects are undertaken by teams that are scattered across " 1.563 "the globe. Contributors who are far from a central server will see slower " 1.564 @@ -1989,21 +2015,20 @@ 1.565 msgstr "" 1.566 1.567 #. type: Content of: <book><preface><sect1><sect2><para> 1.568 -#: ../en/ch00-preface.xml:351 1.569 +#: ../en/ch00-preface.xml:352 1.570 msgid "" 1.571 "Centralised revision control systems tend to have relatively low " 1.572 "scalability. It's not unusual for an expensive centralised system to fall " 1.573 "over under the combined load of just a few dozen concurrent users. Once " 1.574 "again, the typical response tends to be an expensive and clunky replication " 1.575 -"facility. Since the load on a central server---if you have one at all---is " 1.576 -"many times lower with a distributed tool (because all of the data is " 1.577 -"replicated everywhere), a single cheap server can handle the needs of a much " 1.578 -"larger team, and replication to balance load becomes a simple matter of " 1.579 -"scripting." 1.580 +"facility. Since the load on a central server—if you have one at all—is many " 1.581 +"times lower with a distributed tool (because all of the data is replicated " 1.582 +"everywhere), a single cheap server can handle the needs of a much larger " 1.583 +"team, and replication to balance load becomes a simple matter of scripting." 1.584 msgstr "" 1.585 1.586 #. type: Content of: <book><preface><sect1><sect2><para> 1.587 -#: ../en/ch00-preface.xml:363 1.588 +#: ../en/ch00-preface.xml:364 1.589 msgid "" 1.590 "If you have an employee in the field, troubleshooting a problem at a " 1.591 "customer's site, they'll benefit from distributed revision control. The tool " 1.592 @@ -2014,39 +2039,39 @@ 1.593 msgstr "" 1.594 1.595 #. type: Content of: <book><preface><sect1><title> 1.596 -#: ../en/ch00-preface.xml:374 1.597 +#: ../en/ch00-preface.xml:375 1.598 msgid "Why choose Mercurial?" 1.599 msgstr "为什么选择 Mercurial?" 1.600 1.601 #. type: Content of: <book><preface><sect1><para> 1.602 -#: ../en/ch00-preface.xml:376 1.603 +#: ../en/ch00-preface.xml:377 1.604 msgid "" 1.605 "Mercurial has a unique set of properties that make it a particularly good " 1.606 "choice as a revision control system." 1.607 msgstr "" 1.608 1.609 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.610 -#: ../en/ch00-preface.xml:379 1.611 +#: ../en/ch00-preface.xml:380 1.612 msgid "It is easy to learn and use." 1.613 msgstr "" 1.614 1.615 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.616 -#: ../en/ch00-preface.xml:380 1.617 -msgid "It is lightweight." 1.618 -msgstr "" 1.619 - 1.620 -#. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.621 #: ../en/ch00-preface.xml:381 1.622 -msgid "It scales excellently." 1.623 +msgid "It is lightweight." 1.624 msgstr "" 1.625 1.626 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.627 #: ../en/ch00-preface.xml:382 1.628 +msgid "It scales excellently." 1.629 +msgstr "" 1.630 + 1.631 +#. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.632 +#: ../en/ch00-preface.xml:383 1.633 msgid "It is easy to customise." 1.634 msgstr "" 1.635 1.636 #. type: Content of: <book><preface><sect1><para> 1.637 -#: ../en/ch00-preface.xml:385 1.638 +#: ../en/ch00-preface.xml:386 1.639 msgid "" 1.640 "If you are at all familiar with revision control systems, you should be able " 1.641 "to get up and running with Mercurial in less than five minutes. Even if not, " 1.642 @@ -2056,7 +2081,7 @@ 1.643 msgstr "" 1.644 1.645 #. type: Content of: <book><preface><sect1><para> 1.646 -#: ../en/ch00-preface.xml:392 1.647 +#: ../en/ch00-preface.xml:393 1.648 msgid "" 1.649 "On a small project, you can start working with Mercurial in moments. Creating " 1.650 "new changes and branches; transferring changes around (whether locally or " 1.651 @@ -2066,7 +2091,7 @@ 1.652 msgstr "" 1.653 1.654 #. type: Content of: <book><preface><sect1><para> 1.655 -#: ../en/ch00-preface.xml:399 1.656 +#: ../en/ch00-preface.xml:400 1.657 msgid "" 1.658 "The usefulness of Mercurial is not limited to small projects: it is used by " 1.659 "projects with hundreds to thousands of contributors, each containing tens of " 1.660 @@ -2074,7 +2099,7 @@ 1.661 msgstr "" 1.662 1.663 #. type: Content of: <book><preface><sect1><para> 1.664 -#: ../en/ch00-preface.xml:404 1.665 +#: ../en/ch00-preface.xml:405 1.666 msgid "" 1.667 "If the core functionality of Mercurial is not enough for you, it's easy to " 1.668 "build on. Mercurial is well suited to scripting tasks, and its clean " 1.669 @@ -2085,12 +2110,12 @@ 1.670 msgstr "" 1.671 1.672 #. type: Content of: <book><preface><sect1><title> 1.673 -#: ../en/ch00-preface.xml:414 1.674 +#: ../en/ch00-preface.xml:415 1.675 msgid "Mercurial compared with other tools" 1.676 msgstr "Mercurial 与其它工具的比较" 1.677 1.678 #. type: Content of: <book><preface><sect1><para> 1.679 -#: ../en/ch00-preface.xml:416 1.680 +#: ../en/ch00-preface.xml:417 1.681 msgid "" 1.682 "Before you read on, please understand that this section necessarily reflects " 1.683 "my own experiences, interests, and (dare I say it) biases. I have used every " 1.684 @@ -2099,19 +2124,19 @@ 1.685 msgstr "" 1.686 1.687 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.688 -#: ../en/ch00-preface.xml:424 ../en/ch00-preface.xml:635 1.689 +#: ../en/ch00-preface.xml:425 ../en/ch00-preface.xml:636 1.690 msgid "Subversion" 1.691 msgstr "" 1.692 1.693 #. type: Content of: <book><preface><sect1><sect2><para> 1.694 -#: ../en/ch00-preface.xml:426 1.695 +#: ../en/ch00-preface.xml:427 1.696 msgid "" 1.697 "Subversion is a popular revision control tool, developed to replace CVS. It " 1.698 "has a centralised client/server architecture." 1.699 msgstr "" 1.700 1.701 #. type: Content of: <book><preface><sect1><sect2><para> 1.702 -#: ../en/ch00-preface.xml:430 1.703 +#: ../en/ch00-preface.xml:431 1.704 msgid "" 1.705 "Subversion and Mercurial have similarly named commands for performing the " 1.706 "same operations, so if you're familiar with one, it is easy to learn to use " 1.707 @@ -2119,7 +2144,7 @@ 1.708 msgstr "" 1.709 1.710 #. type: Content of: <book><preface><sect1><sect2><para> 1.711 -#: ../en/ch00-preface.xml:435 1.712 +#: ../en/ch00-preface.xml:436 1.713 msgid "" 1.714 "Prior to version 1.5, Subversion had no useful support for merges. At the " 1.715 "time of writing, its merge tracking capability is new, and known to be <ulink " 1.716 @@ -2128,7 +2153,7 @@ 1.717 msgstr "" 1.718 1.719 #. type: Content of: <book><preface><sect1><sect2><para> 1.720 -#: ../en/ch00-preface.xml:441 1.721 +#: ../en/ch00-preface.xml:442 1.722 msgid "" 1.723 "Mercurial has a substantial performance advantage over Subversion on every " 1.724 "revision control operation I have benchmarked. I have measured its advantage " 1.725 @@ -2142,7 +2167,7 @@ 1.726 msgstr "" 1.727 1.728 #. type: Content of: <book><preface><sect1><sect2><para> 1.729 -#: ../en/ch00-preface.xml:454 1.730 +#: ../en/ch00-preface.xml:455 1.731 msgid "" 1.732 "Additionally, Subversion incurs substantial storage overhead to avoid network " 1.733 "transactions for a few common operations, such as finding modified files " 1.734 @@ -2154,7 +2179,7 @@ 1.735 msgstr "" 1.736 1.737 #. type: Content of: <book><preface><sect1><sect2><para> 1.738 -#: ../en/ch00-preface.xml:464 1.739 +#: ../en/ch00-preface.xml:465 1.740 msgid "" 1.741 "Subversion is widely supported by third party tools. Mercurial currently " 1.742 "lags considerably in this area. This gap is closing, however, and indeed " 1.743 @@ -2163,7 +2188,7 @@ 1.744 msgstr "" 1.745 1.746 #. type: Content of: <book><preface><sect1><sect2><para> 1.747 -#: ../en/ch00-preface.xml:470 1.748 +#: ../en/ch00-preface.xml:471 1.749 msgid "" 1.750 "Because Subversion doesn't store revision history on the client, it is well " 1.751 "suited to managing projects that deal with lots of large, opaque binary " 1.752 @@ -2174,7 +2199,7 @@ 1.753 msgstr "" 1.754 1.755 #. type: Content of: <book><preface><sect1><sect2><para> 1.756 -#: ../en/ch00-preface.xml:479 1.757 +#: ../en/ch00-preface.xml:480 1.758 msgid "" 1.759 "In addition, it's often difficult or, more usually, impossible to merge " 1.760 "different versions of a binary file. Subversion's ability to let a user lock " 1.761 @@ -2184,7 +2209,7 @@ 1.762 msgstr "" 1.763 1.764 #. type: Content of: <book><preface><sect1><sect2><para> 1.765 -#: ../en/ch00-preface.xml:486 1.766 +#: ../en/ch00-preface.xml:487 1.767 msgid "" 1.768 "Mercurial can import revision history from a Subversion repository. It can " 1.769 "also export revision history to a Subversion repository. This makes it easy " 1.770 @@ -2195,12 +2220,12 @@ 1.771 msgstr "" 1.772 1.773 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.774 -#: ../en/ch00-preface.xml:498 ../en/ch00-preface.xml:637 1.775 +#: ../en/ch00-preface.xml:499 ../en/ch00-preface.xml:638 1.776 msgid "Git" 1.777 msgstr "" 1.778 1.779 #. type: Content of: <book><preface><sect1><sect2><para> 1.780 -#: ../en/ch00-preface.xml:500 1.781 +#: ../en/ch00-preface.xml:501 1.782 msgid "" 1.783 "Git is a distributed revision control tool that was developed for managing " 1.784 "the Linux kernel source tree. Like Mercurial, its early design was somewhat " 1.785 @@ -2208,7 +2233,7 @@ 1.786 msgstr "" 1.787 1.788 #. type: Content of: <book><preface><sect1><sect2><para> 1.789 -#: ../en/ch00-preface.xml:505 1.790 +#: ../en/ch00-preface.xml:506 1.791 msgid "" 1.792 "Git has a very large command set, with version 1.5.0 providing 139 individual " 1.793 "commands. It has something of a reputation for being difficult to learn. " 1.794 @@ -2216,7 +2241,7 @@ 1.795 msgstr "" 1.796 1.797 #. type: Content of: <book><preface><sect1><sect2><para> 1.798 -#: ../en/ch00-preface.xml:510 1.799 +#: ../en/ch00-preface.xml:511 1.800 msgid "" 1.801 "In terms of performance, Git is extremely fast. In several cases, it is " 1.802 "faster than Mercurial, at least on Linux, while Mercurial performs better on " 1.803 @@ -2226,7 +2251,7 @@ 1.804 msgstr "" 1.805 1.806 #. type: Content of: <book><preface><sect1><sect2><para> 1.807 -#: ../en/ch00-preface.xml:517 1.808 +#: ../en/ch00-preface.xml:518 1.809 msgid "" 1.810 "While a Mercurial repository needs no maintenance, a Git repository requires " 1.811 "frequent manual <quote>repacks</quote> of its metadata. Without these, " 1.812 @@ -2239,7 +2264,7 @@ 1.813 msgstr "" 1.814 1.815 #. type: Content of: <book><preface><sect1><sect2><para> 1.816 -#: ../en/ch00-preface.xml:528 1.817 +#: ../en/ch00-preface.xml:529 1.818 msgid "" 1.819 "The core of Git is written in C. Many Git commands are implemented as shell " 1.820 "or Perl scripts, and the quality of these scripts varies widely. I have " 1.821 @@ -2248,17 +2273,17 @@ 1.822 msgstr "" 1.823 1.824 #. type: Content of: <book><preface><sect1><sect2><para> 1.825 -#: ../en/ch00-preface.xml:534 1.826 +#: ../en/ch00-preface.xml:535 1.827 msgid "Mercurial can import revision history from a Git repository." 1.828 msgstr "" 1.829 1.830 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.831 -#: ../en/ch00-preface.xml:540 ../en/ch00-preface.xml:636 1.832 +#: ../en/ch00-preface.xml:541 ../en/ch00-preface.xml:637 1.833 msgid "CVS" 1.834 msgstr "" 1.835 1.836 #. type: Content of: <book><preface><sect1><sect2><para> 1.837 -#: ../en/ch00-preface.xml:542 1.838 +#: ../en/ch00-preface.xml:543 1.839 msgid "" 1.840 "CVS is probably the most widely used revision control tool in the world. Due " 1.841 "to its age and internal untidiness, it has been only lightly maintained for " 1.842 @@ -2266,7 +2291,7 @@ 1.843 msgstr "" 1.844 1.845 #. type: Content of: <book><preface><sect1><sect2><para> 1.846 -#: ../en/ch00-preface.xml:546 1.847 +#: ../en/ch00-preface.xml:547 1.848 msgid "" 1.849 "It has a centralised client/server architecture. It does not group related " 1.850 "file changes into atomic commits, making it easy for people to <quote>break " 1.851 @@ -2280,7 +2305,7 @@ 1.852 msgstr "" 1.853 1.854 #. type: Content of: <book><preface><sect1><sect2><para> 1.855 -#: ../en/ch00-preface.xml:558 1.856 +#: ../en/ch00-preface.xml:559 1.857 msgid "" 1.858 "CVS has a muddled notion of tags and branches that I will not attempt to even " 1.859 "describe. It does not support renaming of files or directories well, making " 1.860 @@ -2291,7 +2316,7 @@ 1.861 msgstr "" 1.862 1.863 #. type: Content of: <book><preface><sect1><sect2><para> 1.864 -#: ../en/ch00-preface.xml:566 1.865 +#: ../en/ch00-preface.xml:567 1.866 msgid "" 1.867 "Mercurial can import CVS revision history. However, there are a few caveats " 1.868 "that apply; these are true of every other revision control tool's CVS " 1.869 @@ -2306,17 +2331,17 @@ 1.870 msgstr "" 1.871 1.872 #. type: Content of: <book><preface><sect1><sect2><para> 1.873 -#: ../en/ch00-preface.xml:580 1.874 +#: ../en/ch00-preface.xml:581 1.875 msgid "Mercurial can import revision history from a CVS repository." 1.876 msgstr "" 1.877 1.878 #. type: Content of: <book><preface><sect1><sect2><title> 1.879 -#: ../en/ch00-preface.xml:586 1.880 +#: ../en/ch00-preface.xml:587 1.881 msgid "Commercial tools" 1.882 msgstr "商业工具" 1.883 1.884 #. type: Content of: <book><preface><sect1><sect2><para> 1.885 -#: ../en/ch00-preface.xml:588 1.886 +#: ../en/ch00-preface.xml:589 1.887 msgid "" 1.888 "Perforce has a centralised client/server architecture, with no client-side " 1.889 "caching of any data. Unlike modern revision control tools, Perforce requires " 1.890 @@ -2325,7 +2350,7 @@ 1.891 msgstr "" 1.892 1.893 #. type: Content of: <book><preface><sect1><sect2><para> 1.894 -#: ../en/ch00-preface.xml:594 1.895 +#: ../en/ch00-preface.xml:595 1.896 msgid "" 1.897 "The performance of Perforce is quite good for small teams, but it falls off " 1.898 "rapidly as the number of users grows beyond a few dozen. Modestly large " 1.899 @@ -2334,12 +2359,12 @@ 1.900 msgstr "" 1.901 1.902 #. type: Content of: <book><preface><sect1><sect2><title> 1.903 -#: ../en/ch00-preface.xml:603 1.904 +#: ../en/ch00-preface.xml:604 1.905 msgid "Choosing a revision control tool" 1.906 msgstr "选择版本控制工具" 1.907 1.908 #. type: Content of: <book><preface><sect1><sect2><para> 1.909 -#: ../en/ch00-preface.xml:605 1.910 +#: ../en/ch00-preface.xml:606 1.911 msgid "" 1.912 "With the exception of CVS, all of the tools listed above have unique " 1.913 "strengths that suit them to particular styles of work. There is no single " 1.914 @@ -2347,14 +2372,14 @@ 1.915 msgstr "" 1.916 1.917 #. type: Content of: <book><preface><sect1><sect2><para> 1.918 -#: ../en/ch00-preface.xml:610 1.919 +#: ../en/ch00-preface.xml:611 1.920 msgid "" 1.921 "As an example, Subversion is a good choice for working with frequently edited " 1.922 "binary files, due to its centralised nature and support for file locking." 1.923 msgstr "" 1.924 1.925 #. type: Content of: <book><preface><sect1><sect2><para> 1.926 -#: ../en/ch00-preface.xml:614 1.927 +#: ../en/ch00-preface.xml:615 1.928 msgid "" 1.929 "I personally find Mercurial's properties of simplicity, performance, and good " 1.930 "merge support to be a compelling combination that has served me well for " 1.931 @@ -2362,12 +2387,12 @@ 1.932 msgstr "" 1.933 1.934 #. type: Content of: <book><preface><sect1><title> 1.935 -#: ../en/ch00-preface.xml:622 1.936 +#: ../en/ch00-preface.xml:623 1.937 msgid "Switching from another tool to Mercurial" 1.938 msgstr "从其它工具切换到 Mercurial" 1.939 1.940 #. type: Content of: <book><preface><sect1><para> 1.941 -#: ../en/ch00-preface.xml:624 1.942 +#: ../en/ch00-preface.xml:625 1.943 msgid "" 1.944 "Mercurial is bundled with an extension named <literal role=\"hg-ext" 1.945 "\">convert</literal>, which can incrementally import revision history from " 1.946 @@ -2378,19 +2403,19 @@ 1.947 msgstr "" 1.948 1.949 #. type: Content of: <book><preface><sect1><para> 1.950 -#: ../en/ch00-preface.xml:632 1.951 +#: ../en/ch00-preface.xml:633 1.952 msgid "" 1.953 "The revision control tools supported by <literal role=\"hg-ext\">convert</" 1.954 "literal> are as follows:" 1.955 msgstr "<literal role=\"hg-ext\">convert</literal> 支持的版本控制工具有:" 1.956 1.957 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.958 -#: ../en/ch00-preface.xml:638 1.959 +#: ../en/ch00-preface.xml:639 1.960 msgid "Darcs" 1.961 msgstr "" 1.962 1.963 #. type: Content of: <book><preface><sect1><para> 1.964 -#: ../en/ch00-preface.xml:640 1.965 +#: ../en/ch00-preface.xml:641 1.966 msgid "" 1.967 "In addition, <literal role=\"hg-ext\">convert</literal> can export changes " 1.968 "from Mercurial to Subversion. This makes it possible to try Subversion and " 1.969 @@ -2399,7 +2424,7 @@ 1.970 msgstr "" 1.971 1.972 #. type: Content of: <book><preface><sect1><para> 1.973 -#: ../en/ch00-preface.xml:646 1.974 +#: ../en/ch00-preface.xml:647 1.975 msgid "" 1.976 "The <command role=\"hg-ext-convert\">convert</command> command is easy to " 1.977 "use. Simply point it at the path or URL of the source repository, optionally " 1.978 @@ -2409,12 +2434,12 @@ 1.979 msgstr "" 1.980 1.981 #. type: Content of: <book><preface><sect1><title> 1.982 -#: ../en/ch00-preface.xml:655 1.983 +#: ../en/ch00-preface.xml:656 1.984 msgid "A short history of revision control" 1.985 msgstr "版本控制简史" 1.986 1.987 #. type: Content of: <book><preface><sect1><para> 1.988 -#: ../en/ch00-preface.xml:657 1.989 +#: ../en/ch00-preface.xml:658 1.990 msgid "" 1.991 "The best known of the old-time revision control tools is SCCS (Source Code " 1.992 "Control System), which Marc Rochkind wrote at Bell Labs, in the early 1970s. " 1.993 @@ -2427,7 +2452,7 @@ 1.994 msgstr "" 1.995 1.996 #. type: Content of: <book><preface><sect1><para> 1.997 -#: ../en/ch00-preface.xml:668 1.998 +#: ../en/ch00-preface.xml:669 1.999 msgid "" 1.1000 "Walter Tichy developed a free alternative to SCCS in the early 1980s; he " 1.1001 "called his program RCS (Revision Control System). Like SCCS, RCS required " 1.1002 @@ -2436,7 +2461,7 @@ 1.1003 msgstr "" 1.1004 1.1005 #. type: Content of: <book><preface><sect1><para> 1.1006 -#: ../en/ch00-preface.xml:674 1.1007 +#: ../en/ch00-preface.xml:675 1.1008 msgid "" 1.1009 "Later in the 1980s, Dick Grune used RCS as a building block for a set of " 1.1010 "shell scripts he initially called cmt, but then renamed to CVS (Concurrent " 1.1011 @@ -2449,7 +2474,7 @@ 1.1012 msgstr "" 1.1013 1.1014 #. type: Content of: <book><preface><sect1><para> 1.1015 -#: ../en/ch00-preface.xml:685 1.1016 +#: ../en/ch00-preface.xml:686 1.1017 msgid "" 1.1018 "Brian Berliner took Grune's original scripts and rewrote them in C, releasing " 1.1019 "in 1989 the code that has since developed into the modern version of CVS. " 1.1020 @@ -2463,7 +2488,7 @@ 1.1021 msgstr "" 1.1022 1.1023 #. type: Content of: <book><preface><sect1><para> 1.1024 -#: ../en/ch00-preface.xml:696 1.1025 +#: ../en/ch00-preface.xml:697 1.1026 msgid "" 1.1027 "In the early 1990s, Sun Microsystems developed an early distributed revision " 1.1028 "control system, called TeamWare. A TeamWare workspace contains a complete " 1.1029 @@ -2473,7 +2498,7 @@ 1.1030 msgstr "" 1.1031 1.1032 #. type: Content of: <book><preface><sect1><para> 1.1033 -#: ../en/ch00-preface.xml:703 1.1034 +#: ../en/ch00-preface.xml:704 1.1035 msgid "" 1.1036 "As the 1990s progressed, awareness grew of a number of problems with CVS. It " 1.1037 "records simultaneous changes to multiple files individually, instead of " 1.1038 @@ -2485,7 +2510,7 @@ 1.1039 msgstr "" 1.1040 1.1041 #. type: Content of: <book><preface><sect1><para> 1.1042 -#: ../en/ch00-preface.xml:713 1.1043 +#: ../en/ch00-preface.xml:714 1.1044 msgid "" 1.1045 "In 2001, Jim Blandy and Karl Fogel, two developers who had worked on CVS, " 1.1046 "started a project to replace it with a tool that would have a better " 1.1047 @@ -2497,7 +2522,7 @@ 1.1048 msgstr "" 1.1049 1.1050 #. type: Content of: <book><preface><sect1><para> 1.1051 -#: ../en/ch00-preface.xml:722 1.1052 +#: ../en/ch00-preface.xml:723 1.1053 msgid "" 1.1054 "More or less simultaneously, Graydon Hoare began working on an ambitious " 1.1055 "distributed revision control system that he named Monotone. While Monotone " 1.1056 @@ -2508,7 +2533,7 @@ 1.1057 msgstr "" 1.1058 1.1059 #. type: Content of: <book><preface><sect1><para> 1.1060 -#: ../en/ch00-preface.xml:731 1.1061 +#: ../en/ch00-preface.xml:732 1.1062 msgid "" 1.1063 "Mercurial began life in 2005. While a few aspects of its design are " 1.1064 "influenced by Monotone, Mercurial focuses on ease of use, high performance, " 1.1065 @@ -2516,12 +2541,13 @@ 1.1066 msgstr "" 1.1067 1.1068 #. type: Content of: <book><preface><sect1><title> 1.1069 -#: ../en/ch00-preface.xml:739 1.1070 +#: ../en/ch00-preface.xml:740 1.1071 +#, fuzzy 1.1072 msgid "Colophon—this book is Free" 1.1073 msgstr "后记—本书是自由的!" 1.1074 1.1075 #. type: Content of: <book><preface><sect1><para> 1.1076 -#: ../en/ch00-preface.xml:741 1.1077 +#: ../en/ch00-preface.xml:742 1.1078 msgid "" 1.1079 "This book is licensed under the Open Publication License, and is produced " 1.1080 "entirely using Free Software tools. It is typeset with DocBook XML. " 1.1081 @@ -2530,7 +2556,7 @@ 1.1082 msgstr "" 1.1083 1.1084 #. type: Content of: <book><preface><sect1><para> 1.1085 -#: ../en/ch00-preface.xml:746 1.1086 +#: ../en/ch00-preface.xml:747 1.1087 msgid "" 1.1088 "The complete source code for this book is published as a Mercurial " 1.1089 "repository, at <ulink url=\"http://hg.serpentine.com/mercurial/book\">http://" 1.1090 @@ -2559,11 +2585,38 @@ 1.1091 1.1092 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1093 #: ../en/ch01-tour-basic.xml:15 1.1094 +msgid "Windows" 1.1095 +msgstr "" 1.1096 + 1.1097 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1098 +#: ../en/ch01-tour-basic.xml:17 1.1099 +msgid "" 1.1100 +"The best version of Mercurial for Windows is TortoiseHg, which can be found " 1.1101 +"at <ulink url=\"http://bitbucket.org/tortoisehg/stable/wiki/Home\">http://" 1.1102 +"bitbucket.org/tortoisehg/stable/wiki/Home</ulink>. This package has no " 1.1103 +"external dependencies; it <quote>just works</quote>. It provides both " 1.1104 +"command line and graphical user interfaces." 1.1105 +msgstr "" 1.1106 + 1.1107 +#. type: Content of: <book><chapter><sect1><sect2><title> 1.1108 +#: ../en/ch01-tour-basic.xml:27 1.1109 +msgid "Mac OS X" 1.1110 +msgstr "Mac OS X" 1.1111 + 1.1112 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1113 +#: ../en/ch01-tour-basic.xml:29 1.1114 +msgid "" 1.1115 +"Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" 1.1116 +"\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>." 1.1117 +msgstr "" 1.1118 + 1.1119 +#. type: Content of: <book><chapter><sect1><sect2><title> 1.1120 +#: ../en/ch01-tour-basic.xml:35 1.1121 msgid "Linux" 1.1122 msgstr "Linux" 1.1123 1.1124 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1125 -#: ../en/ch01-tour-basic.xml:17 1.1126 +#: ../en/ch01-tour-basic.xml:37 1.1127 msgid "" 1.1128 "Because each Linux distribution has its own packaging tools, policies, and " 1.1129 "rate of development, it's difficult to give a comprehensive set of " 1.1130 @@ -2576,7 +2629,7 @@ 1.1131 "使用的发行版的 Mercurial 维护者的活跃程度。" 1.1132 1.1133 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1134 -#: ../en/ch01-tour-basic.xml:24 1.1135 +#: ../en/ch01-tour-basic.xml:44 1.1136 msgid "" 1.1137 "To keep things simple, I will focus on installing Mercurial from the command " 1.1138 "line under the most popular Linux distributions. Most of these distributions " 1.1139 @@ -2588,102 +2641,44 @@ 1.1140 "Mercurial;寻找的包名称是 <literal>mercurial</literal>。" 1.1141 1.1142 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1143 -#: ../en/ch01-tour-basic.xml:32 1.1144 -msgid "Debian:" 1.1145 -msgstr "Debian:" 1.1146 +#: ../en/ch01-tour-basic.xml:52 1.1147 +msgid "Ubuntu and Debian:" 1.1148 +msgstr "" 1.1149 1.1150 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1151 -#: ../en/ch01-tour-basic.xml:34 1.1152 -msgid "Fedora Core:" 1.1153 -msgstr "Fedora Core:" 1.1154 +#: ../en/ch01-tour-basic.xml:54 1.1155 +#, fuzzy 1.1156 +msgid "Fedora and OpenSUSE:" 1.1157 +msgstr "OpenSUSE:" 1.1158 1.1159 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1160 -#: ../en/ch01-tour-basic.xml:36 1.1161 +#: ../en/ch01-tour-basic.xml:56 1.1162 msgid "Gentoo:" 1.1163 msgstr "Gentoo:" 1.1164 1.1165 -#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1166 -#: ../en/ch01-tour-basic.xml:38 1.1167 -msgid "OpenSUSE:" 1.1168 -msgstr "OpenSUSE:" 1.1169 - 1.1170 -#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1171 -#: ../en/ch01-tour-basic.xml:40 1.1172 -msgid "" 1.1173 -"Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run " 1.1174 -"the following command." 1.1175 -msgstr "Ubuntu: Ubuntu 的 Mercurial 包基于 Debian。安装时,使用如下命令:" 1.1176 - 1.1177 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1178 -#: ../en/ch01-tour-basic.xml:48 1.1179 +#: ../en/ch01-tour-basic.xml:62 1.1180 msgid "Solaris" 1.1181 msgstr "Solaris" 1.1182 1.1183 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1184 -#: ../en/ch01-tour-basic.xml:50 1.1185 +#: ../en/ch01-tour-basic.xml:64 1.1186 +#, fuzzy 1.1187 msgid "" 1.1188 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." 1.1189 -"sunfreeware.com</ulink>, is a good source for a large number of pre-built " 1.1190 -"Solaris packages for 32 and 64 bit Intel and Sparc architectures, including " 1.1191 -"current versions of Mercurial." 1.1192 +"sunfreeware.com</ulink>, provides prebuilt packages of Mercurial." 1.1193 msgstr "" 1.1194 "位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" 1.1195 "ulink> 的 SunFreeWare 是很好的二进制安装源,它包含 Intel 和 Sparc 架构的 32 位" 1.1196 "和 64 位包,包含 Mercurial 的当前版本。" 1.1197 1.1198 -#. type: Content of: <book><chapter><sect1><sect2><title> 1.1199 -#: ../en/ch01-tour-basic.xml:58 1.1200 -msgid "Mac OS X" 1.1201 -msgstr "Mac OS X" 1.1202 - 1.1203 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1204 -#: ../en/ch01-tour-basic.xml:60 1.1205 -msgid "" 1.1206 -"Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" 1.1207 -"\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " 1.1208 -"This package works on both Intel- and Power-based Macs. Before you can use " 1.1209 -"it, you must install a compatible version of Universal MacPython " 1.1210 -"<citation>web:macpython</citation>. This is easy to do; simply follow the " 1.1211 -"instructions on Lee's site." 1.1212 -msgstr "" 1.1213 - 1.1214 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1215 -#: ../en/ch01-tour-basic.xml:69 1.1216 -msgid "" 1.1217 -"It's also possible to install Mercurial using Fink or MacPorts, two popular " 1.1218 -"free package managers for Mac OS X. If you have Fink, use <command>sudo apt-" 1.1219 -"get install mercurial-py25</command>. If MacPorts, <command>sudo port " 1.1220 -"install mercurial</command>." 1.1221 -msgstr "" 1.1222 - 1.1223 -#. type: Content of: <book><chapter><sect1><sect2><title> 1.1224 -#: ../en/ch01-tour-basic.xml:77 1.1225 -msgid "Windows" 1.1226 -msgstr "" 1.1227 - 1.1228 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1229 -#: ../en/ch01-tour-basic.xml:79 1.1230 -msgid "" 1.1231 -"Lee Cantey publishes an installer of Mercurial for Windows at <ulink url=" 1.1232 -"\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " 1.1233 -"This package has no external dependencies; it <quote>just works</quote>." 1.1234 -msgstr "" 1.1235 - 1.1236 -#. type: Content of: <book><chapter><sect1><sect2><note><para> 1.1237 -#: ../en/ch01-tour-basic.xml:86 1.1238 -msgid "" 1.1239 -"The Windows version of Mercurial does not automatically convert line endings " 1.1240 -"between Windows and Unix styles. If you want to share work with Unix users, " 1.1241 -"you must do a little additional configuration work. XXX Flesh this out." 1.1242 -msgstr "" 1.1243 - 1.1244 #. type: Content of: <book><chapter><sect1><title> 1.1245 -#: ../en/ch01-tour-basic.xml:96 1.1246 +#: ../en/ch01-tour-basic.xml:73 1.1247 msgid "Getting started" 1.1248 msgstr "开始" 1.1249 1.1250 #. type: Content of: <book><chapter><sect1><para> 1.1251 -#: ../en/ch01-tour-basic.xml:98 1.1252 +#: ../en/ch01-tour-basic.xml:75 1.1253 msgid "" 1.1254 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command " 1.1255 "to find out whether Mercurial is actually installed properly. The actual " 1.1256 @@ -2692,12 +2687,12 @@ 1.1257 msgstr "" 1.1258 1.1259 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1260 -#: ../en/ch01-tour-basic.xml:107 1.1261 +#: ../en/ch01-tour-basic.xml:84 1.1262 msgid "Built-in help" 1.1263 msgstr "内置帮助" 1.1264 1.1265 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1266 -#: ../en/ch01-tour-basic.xml:109 1.1267 +#: ../en/ch01-tour-basic.xml:86 1.1268 msgid "" 1.1269 "Mercurial provides a built-in help system. This is invaluable for those " 1.1270 "times when you find yourself stuck trying to remember how to run a command. " 1.1271 @@ -2708,7 +2703,7 @@ 1.1272 msgstr "" 1.1273 1.1274 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1275 -#: ../en/ch01-tour-basic.xml:120 1.1276 +#: ../en/ch01-tour-basic.xml:97 1.1277 msgid "" 1.1278 "For a more impressive level of detail (which you won't usually need) run " 1.1279 "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></" 1.1280 @@ -2718,12 +2713,12 @@ 1.1281 msgstr "" 1.1282 1.1283 #. type: Content of: <book><chapter><sect1><title> 1.1284 -#: ../en/ch01-tour-basic.xml:131 1.1285 +#: ../en/ch01-tour-basic.xml:108 1.1286 msgid "Working with a repository" 1.1287 msgstr "使用版本库" 1.1288 1.1289 #. type: Content of: <book><chapter><sect1><para> 1.1290 -#: ../en/ch01-tour-basic.xml:133 1.1291 +#: ../en/ch01-tour-basic.xml:110 1.1292 msgid "" 1.1293 "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. " 1.1294 "The repository for a project contains all of the files that <quote>belong to</" 1.1295 @@ -2731,7 +2726,7 @@ 1.1296 msgstr "" 1.1297 1.1298 #. type: Content of: <book><chapter><sect1><para> 1.1299 -#: ../en/ch01-tour-basic.xml:139 1.1300 +#: ../en/ch01-tour-basic.xml:116 1.1301 msgid "" 1.1302 "There's nothing particularly magical about a repository; it is simply a " 1.1303 "directory tree in your filesystem that Mercurial treats as special. You can " 1.1304 @@ -2740,46 +2735,55 @@ 1.1305 msgstr "" 1.1306 1.1307 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1308 -#: ../en/ch01-tour-basic.xml:146 1.1309 +#: ../en/ch01-tour-basic.xml:123 1.1310 msgid "Making a local copy of a repository" 1.1311 msgstr "创建版本库的工作副本" 1.1312 1.1313 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1314 -#: ../en/ch01-tour-basic.xml:148 1.1315 +#: ../en/ch01-tour-basic.xml:125 1.1316 msgid "" 1.1317 "<emphasis>Copying</emphasis> a repository is just a little bit special. " 1.1318 "While you could use a normal file copying command to make a copy of a " 1.1319 "repository, it's best to use a built-in command that Mercurial provides. " 1.1320 "This command is called <command role=\"hg-cmd\">hg clone</command>, because " 1.1321 -"it creates an identical copy of an existing repository." 1.1322 -msgstr "" 1.1323 - 1.1324 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1325 -#: ../en/ch01-tour-basic.xml:157 1.1326 +"it makes an identical copy of an existing repository." 1.1327 +msgstr "" 1.1328 + 1.1329 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1330 +#: ../en/ch01-tour-basic.xml:134 1.1331 +msgid "" 1.1332 +"One advantage of using <command role=\"hg-cmd\">hg clone</command> is that, " 1.1333 +"as we can see above, it lets us clone repositories over the network. Another " 1.1334 +"is that it remembers where we cloned from, which we'll find useful soon when " 1.1335 +"we want to fetch new changes from another repository." 1.1336 +msgstr "" 1.1337 + 1.1338 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1339 +#: ../en/ch01-tour-basic.xml:140 1.1340 msgid "" 1.1341 "If our clone succeeded, we should now have a local directory called <filename " 1.1342 "class=\"directory\">hello</filename>. This directory will contain some files." 1.1343 msgstr "" 1.1344 1.1345 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1346 -#: ../en/ch01-tour-basic.xml:163 1.1347 +#: ../en/ch01-tour-basic.xml:146 1.1348 msgid "" 1.1349 "These files have the same contents and history in our repository as they do " 1.1350 "in the repository we cloned." 1.1351 msgstr "" 1.1352 1.1353 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1354 -#: ../en/ch01-tour-basic.xml:166 1.1355 +#: ../en/ch01-tour-basic.xml:149 1.1356 msgid "" 1.1357 "Every Mercurial repository is complete, self-contained, and independent. It " 1.1358 -"contains its own private copy of a project's files and history. A cloned " 1.1359 -"repository remembers the location of the repository it was cloned from, but " 1.1360 -"it does not communicate with that repository, or any other, unless you tell " 1.1361 -"it to." 1.1362 -msgstr "" 1.1363 - 1.1364 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1365 -#: ../en/ch01-tour-basic.xml:173 1.1366 +"contains its own private copy of a project's files and history. As we just " 1.1367 +"mentioned, a cloned repository remembers the location of the repository it " 1.1368 +"was cloned from, but Mercurial will not communicate with that repository, or " 1.1369 +"any other, unless you tell it to." 1.1370 +msgstr "" 1.1371 + 1.1372 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1373 +#: ../en/ch01-tour-basic.xml:156 1.1374 msgid "" 1.1375 "What this means for now is that we're free to experiment with our repository, " 1.1376 "safe in the knowledge that it's a private <quote>sandbox</quote> that won't " 1.1377 @@ -2787,12 +2791,12 @@ 1.1378 msgstr "" 1.1379 1.1380 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1381 -#: ../en/ch01-tour-basic.xml:179 1.1382 +#: ../en/ch01-tour-basic.xml:162 1.1383 msgid "What's in a repository?" 1.1384 msgstr "什么是版本库?" 1.1385 1.1386 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1387 -#: ../en/ch01-tour-basic.xml:181 1.1388 +#: ../en/ch01-tour-basic.xml:164 1.1389 msgid "" 1.1390 "When we take a more detailed look inside a repository, we can see that it " 1.1391 "contains a directory named <filename class=\"directory\">.hg</filename>. " 1.1392 @@ -2800,7 +2804,7 @@ 1.1393 msgstr "" 1.1394 1.1395 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1396 -#: ../en/ch01-tour-basic.xml:188 1.1397 +#: ../en/ch01-tour-basic.xml:171 1.1398 msgid "" 1.1399 "The contents of the <filename class=\"directory\">.hg</filename> directory " 1.1400 "and its subdirectories are private to Mercurial. Every other file and " 1.1401 @@ -2808,7 +2812,7 @@ 1.1402 msgstr "" 1.1403 1.1404 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1405 -#: ../en/ch01-tour-basic.xml:194 1.1406 +#: ../en/ch01-tour-basic.xml:177 1.1407 msgid "" 1.1408 "To introduce a little terminology, the <filename class=\"directory\">.hg</" 1.1409 "filename> directory is the <quote>real</quote> repository, and all of the " 1.1410 @@ -2821,20 +2825,20 @@ 1.1411 msgstr "" 1.1412 1.1413 #. type: Content of: <book><chapter><sect1><title> 1.1414 -#: ../en/ch01-tour-basic.xml:209 1.1415 +#: ../en/ch01-tour-basic.xml:192 1.1416 msgid "A tour through history" 1.1417 msgstr "回溯历史" 1.1418 1.1419 #. type: Content of: <book><chapter><sect1><para> 1.1420 -#: ../en/ch01-tour-basic.xml:211 1.1421 +#: ../en/ch01-tour-basic.xml:194 1.1422 msgid "" 1.1423 "One of the first things we might want to do with a new, unfamiliar repository " 1.1424 "is understand its history. The <command role=\"hg-cmd\">hg log</command> " 1.1425 -"command gives us a view of history." 1.1426 -msgstr "" 1.1427 - 1.1428 -#. type: Content of: <book><chapter><sect1><para> 1.1429 -#: ../en/ch01-tour-basic.xml:218 1.1430 +"command gives us a view of the history of changes in the repository." 1.1431 +msgstr "" 1.1432 + 1.1433 +#. type: Content of: <book><chapter><sect1><para> 1.1434 +#: ../en/ch01-tour-basic.xml:201 1.1435 msgid "" 1.1436 "By default, this command prints a brief paragraph of output for each change " 1.1437 "to the project that was recorded. In Mercurial terminology, we call each of " 1.1438 @@ -2843,24 +2847,27 @@ 1.1439 msgstr "" 1.1440 1.1441 #. type: Content of: <book><chapter><sect1><para> 1.1442 -#: ../en/ch01-tour-basic.xml:224 1.1443 +#: ../en/ch01-tour-basic.xml:207 1.1444 msgid "" 1.1445 "The fields in a record of output from <command role=\"hg-cmd\">hg log</" 1.1446 "command> are as follows." 1.1447 msgstr "" 1.1448 1.1449 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1450 -#: ../en/ch01-tour-basic.xml:227 1.1451 +#: ../en/ch01-tour-basic.xml:211 1.1452 msgid "" 1.1453 "<literal>changeset</literal>: This field has the format of a number, followed " 1.1454 -"by a colon, followed by a hexadecimal string. These are " 1.1455 -"<emphasis>identifiers</emphasis> for the changeset. There are two " 1.1456 -"identifiers because the number is shorter and easier to type than the hex " 1.1457 -"string." 1.1458 +"by a colon, followed by a hexadecimal (or <emphasis>hex</emphasis>) string. " 1.1459 +"These are <emphasis>identifiers</emphasis> for the changeset. The hex string " 1.1460 +"is a unique identifier: the same hex string will always refer to the same " 1.1461 +"changeset. The number is shorter and easier to type than the hex string, but " 1.1462 +"it isn't unique: the same number in two different clones of a repository may " 1.1463 +"identify different changesets. Why provide the number at all, then? For " 1.1464 +"local convenience." 1.1465 msgstr "" 1.1466 1.1467 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1468 -#: ../en/ch01-tour-basic.xml:233 1.1469 +#: ../en/ch01-tour-basic.xml:223 1.1470 msgid "" 1.1471 "<literal>user</literal>: The identity of the person who created the " 1.1472 "changeset. This is a free-form field, but it most often contains a person's " 1.1473 @@ -2868,7 +2875,7 @@ 1.1474 msgstr "" 1.1475 1.1476 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1477 -#: ../en/ch01-tour-basic.xml:237 1.1478 +#: ../en/ch01-tour-basic.xml:227 1.1479 msgid "" 1.1480 "<literal>date</literal>: The date and time on which the changeset was " 1.1481 "created, and the timezone in which it was created. (The date and time are " 1.1482 @@ -2877,21 +2884,30 @@ 1.1483 msgstr "" 1.1484 1.1485 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1486 -#: ../en/ch01-tour-basic.xml:242 1.1487 +#: ../en/ch01-tour-basic.xml:232 1.1488 msgid "" 1.1489 "<literal>summary</literal>: The first line of the text message that the " 1.1490 "creator of the changeset entered to describe the changeset." 1.1491 msgstr "" 1.1492 1.1493 -#. type: Content of: <book><chapter><sect1><para> 1.1494 -#: ../en/ch01-tour-basic.xml:245 1.1495 +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1496 +#: ../en/ch01-tour-basic.xml:236 1.1497 +msgid "" 1.1498 +"Some changesets, such as the first in the list above, have a <literal>tag</" 1.1499 +"literal> field. A tag is another way to identify a changeset, by giving it " 1.1500 +"an easy-to-remember name. (The tag named <literal>tip</literal> is special: " 1.1501 +"it always refers to the newest change in a repository.)" 1.1502 +msgstr "" 1.1503 + 1.1504 +#. type: Content of: <book><chapter><sect1><para> 1.1505 +#: ../en/ch01-tour-basic.xml:244 1.1506 msgid "" 1.1507 "The default output printed by <command role=\"hg-cmd\">hg log</command> is " 1.1508 "purely a summary; it is missing a lot of detail." 1.1509 msgstr "" 1.1510 1.1511 #. type: Content of: <book><chapter><sect1><para> 1.1512 -#: ../en/ch01-tour-basic.xml:249 1.1513 +#: ../en/ch01-tour-basic.xml:248 1.1514 msgid "" 1.1515 "<xref linkend=\"fig:tour-basic:history\"/> provides a graphical " 1.1516 "representation of the history of the <filename class=\"directory\">hello</" 1.1517 @@ -2901,26 +2917,26 @@ 1.1518 msgstr "" 1.1519 1.1520 #. type: Content of: <book><chapter><sect1><figure><title> 1.1521 -#: ../en/ch01-tour-basic.xml:258 1.1522 +#: ../en/ch01-tour-basic.xml:257 1.1523 msgid "" 1.1524 "Graphical history of the <filename class=\"directory\">hello</filename> " 1.1525 "repository" 1.1526 msgstr "版本库 <filename class=\"directory\">hello</filename> 的历史图" 1.1527 1.1528 #. type: Content of: <book><chapter><sect1><figure> 1.1529 -#: ../en/ch01-tour-basic.xml:260 ../en/ch02-tour-merge.xml:50 1.1530 +#: ../en/ch01-tour-basic.xml:259 ../en/ch02-tour-merge.xml:50 1.1531 #: ../en/ch02-tour-merge.xml:181 ../en/ch03-concepts.xml:293 1.1532 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>" 1.1533 msgstr "" 1.1534 1.1535 #. type: Content of: <book><chapter><sect1><figure><mediaobject> 1.1536 -#: ../en/ch01-tour-basic.xml:261 1.1537 +#: ../en/ch01-tour-basic.xml:260 1.1538 msgid "" 1.1539 "<imageobject><imagedata fileref=\"figs/tour-history.png\"/></imageobject>" 1.1540 msgstr "" 1.1541 1.1542 #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject><textobject><phrase> 1.1543 -#: ../en/ch01-tour-basic.xml:262 ../en/ch02-tour-merge.xml:52 1.1544 +#: ../en/ch01-tour-basic.xml:261 ../en/ch02-tour-merge.xml:52 1.1545 #: ../en/ch02-tour-merge.xml:82 ../en/ch02-tour-merge.xml:129 1.1546 #: ../en/ch02-tour-merge.xml:183 ../en/ch02-tour-merge.xml:254 1.1547 #: ../en/ch03-concepts.xml:57 ../en/ch03-concepts.xml:106 1.1548 @@ -2934,12 +2950,12 @@ 1.1549 msgstr "" 1.1550 1.1551 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1552 -#: ../en/ch01-tour-basic.xml:267 1.1553 +#: ../en/ch01-tour-basic.xml:266 1.1554 msgid "Changesets, revisions, and talking to other people" 1.1555 msgstr "修改集,版本,与其它用户交互" 1.1556 1.1557 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1558 -#: ../en/ch01-tour-basic.xml:270 1.1559 +#: ../en/ch01-tour-basic.xml:269 1.1560 msgid "" 1.1561 "As English is a notoriously sloppy language, and computer science has a " 1.1562 "hallowed history of terminological confusion (why use one term when four will " 1.1563 @@ -2951,7 +2967,7 @@ 1.1564 msgstr "" 1.1565 1.1566 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1567 -#: ../en/ch01-tour-basic.xml:280 1.1568 +#: ../en/ch01-tour-basic.xml:279 1.1569 msgid "" 1.1570 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to " 1.1571 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</" 1.1572 @@ -2962,33 +2978,35 @@ 1.1573 msgstr "" 1.1574 1.1575 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1576 -#: ../en/ch01-tour-basic.xml:289 1.1577 -msgid "" 1.1578 -"The revision number is <emphasis>only valid in that repository</emphasis>," 1.1579 +#: ../en/ch01-tour-basic.xml:288 1.1580 +msgid "" 1.1581 +"The revision number is a handy notation that is <emphasis>only valid in that " 1.1582 +"repository</emphasis>." 1.1583 msgstr "" 1.1584 1.1585 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1586 #: ../en/ch01-tour-basic.xml:291 1.1587 msgid "" 1.1588 -"while the hex string is the <emphasis>permanent, unchanging identifier</" 1.1589 +"The hexadecimal string is the <emphasis>permanent, unchanging identifier</" 1.1590 "emphasis> that will always identify that exact changeset in <emphasis>every</" 1.1591 "emphasis> copy of the repository." 1.1592 msgstr "" 1.1593 1.1594 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1595 -#: ../en/ch01-tour-basic.xml:296 1.1596 +#: ../en/ch01-tour-basic.xml:297 1.1597 msgid "" 1.1598 "This distinction is important. If you send someone an email talking about " 1.1599 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 " 1.1600 "will <emphasis>not be the same</emphasis> as yours. The reason for this is " 1.1601 "that a revision number depends on the order in which changes arrived in a " 1.1602 "repository, and there is no guarantee that the same changes will happen in " 1.1603 -"the same order in different repositories. Three changes $a,b,c$ can easily " 1.1604 -"appear in one repository as $0,1,2$, while in another as $1,0,2$." 1.1605 -msgstr "" 1.1606 - 1.1607 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1608 -#: ../en/ch01-tour-basic.xml:306 1.1609 +"the same order in different repositories. Three changes <literal>a,b,c</" 1.1610 +"literal> can easily appear in one repository as <literal>0,1,2</literal>, " 1.1611 +"while in another as <literal>0,2,1</literal>." 1.1612 +msgstr "" 1.1613 + 1.1614 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1615 +#: ../en/ch01-tour-basic.xml:309 1.1616 msgid "" 1.1617 "Mercurial uses revision numbers purely as a convenient shorthand. If you " 1.1618 "need to discuss a changeset with someone, or make a record of a changeset for " 1.1619 @@ -2997,22 +3015,22 @@ 1.1620 msgstr "" 1.1621 1.1622 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1623 -#: ../en/ch01-tour-basic.xml:314 1.1624 +#: ../en/ch01-tour-basic.xml:317 1.1625 msgid "Viewing specific revisions" 1.1626 msgstr "察看指定版本" 1.1627 1.1628 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1629 -#: ../en/ch01-tour-basic.xml:316 1.1630 +#: ../en/ch01-tour-basic.xml:319 1.1631 msgid "" 1.1632 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a " 1.1633 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option " 1.1634 "role=\"hg-opt-log\">--rev</option>) option. You can use either a revision " 1.1635 -"number or a long-form changeset identifier, and you can provide as many " 1.1636 -"revisions as you want." 1.1637 -msgstr "" 1.1638 - 1.1639 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.1640 -#: ../en/ch01-tour-basic.xml:325 1.1641 +"number or a hexadecimal identifier, and you can provide as many revisions as " 1.1642 +"you want." 1.1643 +msgstr "" 1.1644 + 1.1645 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1646 +#: ../en/ch01-tour-basic.xml:328 1.1647 msgid "" 1.1648 "If you want to see the history of several revisions without having to list " 1.1649 "each one, you can use <emphasis>range notation</emphasis>; this lets you " 1.1650 @@ -3021,7 +3039,7 @@ 1.1651 msgstr "" 1.1652 1.1653 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1654 -#: ../en/ch01-tour-basic.xml:333 1.1655 +#: ../en/ch01-tour-basic.xml:336 1.1656 msgid "" 1.1657 "Mercurial also honours the order in which you specify revisions, so <command " 1.1658 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command " 1.1659 @@ -3029,12 +3047,12 @@ 1.1660 msgstr "" 1.1661 1.1662 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1663 -#: ../en/ch01-tour-basic.xml:340 1.1664 +#: ../en/ch01-tour-basic.xml:343 1.1665 msgid "More detailed information" 1.1666 msgstr "更详细的信息" 1.1667 1.1668 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1669 -#: ../en/ch01-tour-basic.xml:342 1.1670 +#: ../en/ch01-tour-basic.xml:345 1.1671 msgid "" 1.1672 "While the summary information printed by <command role=\"hg-cmd\">hg log</" 1.1673 "command> is useful if you already know what you're looking for, you may need " 1.1674 @@ -3046,7 +3064,7 @@ 1.1675 msgstr "" 1.1676 1.1677 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1678 -#: ../en/ch01-tour-basic.xml:354 1.1679 +#: ../en/ch01-tour-basic.xml:357 1.1680 msgid "" 1.1681 "If you want to see both the description and content of a change, add the " 1.1682 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--" 1.1683 @@ -3055,13 +3073,20 @@ 1.1684 "before, see <xref linkend=\"sec:mq:patch\"/> for an overview)." 1.1685 msgstr "" 1.1686 1.1687 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.1688 +#: ../en/ch01-tour-basic.xml:367 1.1689 +msgid "" 1.1690 +"The <option role=\"hg-opt-log\">-p</option> option is tremendously useful, so " 1.1691 +"it's well worth remembering." 1.1692 +msgstr "" 1.1693 + 1.1694 #. type: Content of: <book><chapter><sect1><title> 1.1695 -#: ../en/ch01-tour-basic.xml:367 1.1696 +#: ../en/ch01-tour-basic.xml:374 1.1697 msgid "All about command options" 1.1698 msgstr "命令选项" 1.1699 1.1700 #. type: Content of: <book><chapter><sect1><para> 1.1701 -#: ../en/ch01-tour-basic.xml:369 1.1702 +#: ../en/ch01-tour-basic.xml:376 1.1703 msgid "" 1.1704 "Let's take a brief break from exploring Mercurial commands to discuss a " 1.1705 "pattern in the way that they work; you may find this useful to keep in mind " 1.1706 @@ -3069,7 +3094,7 @@ 1.1707 msgstr "" 1.1708 1.1709 #. type: Content of: <book><chapter><sect1><para> 1.1710 -#: ../en/ch01-tour-basic.xml:373 1.1711 +#: ../en/ch01-tour-basic.xml:380 1.1712 msgid "" 1.1713 "Mercurial has a consistent and straightforward approach to dealing with the " 1.1714 "options that you can pass to commands. It follows the conventions for " 1.1715 @@ -3077,7 +3102,7 @@ 1.1716 msgstr "" 1.1717 1.1718 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1719 -#: ../en/ch01-tour-basic.xml:378 1.1720 +#: ../en/ch01-tour-basic.xml:387 1.1721 msgid "" 1.1722 "Every option has a long name. For example, as we've already seen, the " 1.1723 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" 1.1724 @@ -3085,7 +3110,7 @@ 1.1725 msgstr "" 1.1726 1.1727 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1728 -#: ../en/ch01-tour-basic.xml:382 1.1729 +#: ../en/ch01-tour-basic.xml:393 1.1730 msgid "" 1.1731 "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--" 1.1732 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The " 1.1733 @@ -3094,15 +3119,15 @@ 1.1734 msgstr "" 1.1735 1.1736 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1737 -#: ../en/ch01-tour-basic.xml:387 1.1738 -msgid "" 1.1739 -"Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</" 1.1740 +#: ../en/ch01-tour-basic.xml:400 1.1741 +msgid "" 1.1742 +"Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</" 1.1743 "option>), while short options start with one (e.g. <option role=\"hg-opt-log" 1.1744 "\">-r</option>)." 1.1745 msgstr "" 1.1746 1.1747 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1748 -#: ../en/ch01-tour-basic.xml:391 1.1749 +#: ../en/ch01-tour-basic.xml:406 1.1750 msgid "" 1.1751 "Option naming and usage is consistent across commands. For example, every " 1.1752 "command that lets you specify a changeset ID or revision number accepts both " 1.1753 @@ -3110,8 +3135,16 @@ 1.1754 "rev</option> arguments." 1.1755 msgstr "" 1.1756 1.1757 -#. type: Content of: <book><chapter><sect1><para> 1.1758 -#: ../en/ch01-tour-basic.xml:397 1.1759 +#. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.1760 +#: ../en/ch01-tour-basic.xml:413 1.1761 +msgid "" 1.1762 +"If you are using short options, you can save typing by running them together. " 1.1763 +"For example, the command <command role=\"hg-cmd\">hg log -v -p -r 2</command> " 1.1764 +"can be written as <command role=\"hg-cmd\">hg log -vpr2</command>." 1.1765 +msgstr "" 1.1766 + 1.1767 +#. type: Content of: <book><chapter><sect1><para> 1.1768 +#: ../en/ch01-tour-basic.xml:420 1.1769 msgid "" 1.1770 "In the examples throughout this book, I use short options instead of long. " 1.1771 "This just reflects my own preference, so don't read anything significant into " 1.1772 @@ -3119,7 +3152,7 @@ 1.1773 msgstr "" 1.1774 1.1775 #. type: Content of: <book><chapter><sect1><para> 1.1776 -#: ../en/ch01-tour-basic.xml:401 1.1777 +#: ../en/ch01-tour-basic.xml:424 1.1778 msgid "" 1.1779 "Most commands that print output of some kind will print more output when " 1.1780 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-" 1.1781 @@ -3127,31 +3160,56 @@ 1.1782 "opt-global\">-q</option> (or <option role=\"hg-opt-global\">--quiet</option>)." 1.1783 msgstr "" 1.1784 1.1785 +#. type: Content of: <book><chapter><sect1><note><title> 1.1786 +#: ../en/ch01-tour-basic.xml:431 1.1787 +msgid "Option naming consistency" 1.1788 +msgstr "" 1.1789 + 1.1790 +#. type: Content of: <book><chapter><sect1><note><para> 1.1791 +#: ../en/ch01-tour-basic.xml:433 1.1792 +msgid "" 1.1793 +"Almost always, Mercurial commands use consistent option names to refer to the " 1.1794 +"same concepts. For instance, if a command deals with changesets, you'll " 1.1795 +"always identify them with <option role=\"hg-opt-log\">--rev</option> or " 1.1796 +"<option role=\"hg-opt-log\">-r</option>. This consistent use of option names " 1.1797 +"makes it easier to remember what options a particular command takes." 1.1798 +msgstr "" 1.1799 + 1.1800 #. type: Content of: <book><chapter><sect1><title> 1.1801 -#: ../en/ch01-tour-basic.xml:409 1.1802 +#: ../en/ch01-tour-basic.xml:444 1.1803 msgid "Making and reviewing changes" 1.1804 msgstr "创建和复审修改" 1.1805 1.1806 #. type: Content of: <book><chapter><sect1><para> 1.1807 -#: ../en/ch01-tour-basic.xml:411 1.1808 +#: ../en/ch01-tour-basic.xml:446 1.1809 msgid "" 1.1810 "Now that we have a grasp of viewing history in Mercurial, let's take a look " 1.1811 "at making some changes and examining them." 1.1812 msgstr "" 1.1813 1.1814 #. type: Content of: <book><chapter><sect1><para> 1.1815 -#: ../en/ch01-tour-basic.xml:415 1.1816 +#: ../en/ch01-tour-basic.xml:450 1.1817 msgid "" 1.1818 "The first thing we'll do is isolate our experiment in a repository of its " 1.1819 "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we " 1.1820 "don't need to clone a copy of the remote repository. Since we already have a " 1.1821 "copy of it locally, we can just clone that instead. This is much faster than " 1.1822 "cloning over the network, and cloning a local repository uses less disk space " 1.1823 -"in most cases, too." 1.1824 -msgstr "" 1.1825 - 1.1826 -#. type: Content of: <book><chapter><sect1><para> 1.1827 -#: ../en/ch01-tour-basic.xml:425 1.1828 +"in most cases, too<placeholder type=\"footnote\" id=\"0\"/>." 1.1829 +msgstr "" 1.1830 + 1.1831 +#. type: Content of: <book><chapter><sect1><para><footnote><para> 1.1832 +#: ../en/ch01-tour-basic.xml:457 1.1833 +msgid "" 1.1834 +"The saving of space arises when source and destination repositories are on " 1.1835 +"the same filesystem, in which case Mercurial will use hardlinks to do copy-on-" 1.1836 +"write sharing of its internal metadata. If that explanation meant nothing to " 1.1837 +"you, don't worry: everything happens transparently and automatically, and you " 1.1838 +"don't need to understand it." 1.1839 +msgstr "" 1.1840 + 1.1841 +#. type: Content of: <book><chapter><sect1><para> 1.1842 +#: ../en/ch01-tour-basic.xml:467 1.1843 msgid "" 1.1844 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy " 1.1845 "of a remote repository around, which you can then make temporary clones of to " 1.1846 @@ -3163,27 +3221,27 @@ 1.1847 msgstr "" 1.1848 1.1849 #. type: Content of: <book><chapter><sect1><para> 1.1850 -#: ../en/ch01-tour-basic.xml:434 1.1851 +#: ../en/ch01-tour-basic.xml:476 1.1852 msgid "" 1.1853 "In our <filename class=\"directory\">my-hello</filename> repository, we have " 1.1854 "a file <filename>hello.c</filename> that contains the classic <quote>hello, " 1.1855 -"world</quote> program. Let's use the ancient and venerable <command>sed</" 1.1856 -"command> command to edit this file so that it prints a second line of " 1.1857 -"output. (I'm only using <command>sed</command> to do this because it's easy " 1.1858 -"to write a scripted example this way. Since you're not under the same " 1.1859 -"constraint, you probably won't want to use <command>sed</command>; simply use " 1.1860 -"your preferred text editor to do the same thing.)" 1.1861 -msgstr "" 1.1862 - 1.1863 -#. type: Content of: <book><chapter><sect1><para> 1.1864 -#: ../en/ch01-tour-basic.xml:447 1.1865 +"world</quote> program." 1.1866 +msgstr "" 1.1867 + 1.1868 +#. type: Content of: <book><chapter><sect1><para> 1.1869 +#: ../en/ch01-tour-basic.xml:482 1.1870 +msgid "Let's edit this file so that it prints a second line of output." 1.1871 +msgstr "" 1.1872 + 1.1873 +#. type: Content of: <book><chapter><sect1><para> 1.1874 +#: ../en/ch01-tour-basic.xml:487 1.1875 msgid "" 1.1876 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us " 1.1877 "what Mercurial knows about the files in the repository." 1.1878 msgstr "" 1.1879 1.1880 #. type: Content of: <book><chapter><sect1><para> 1.1881 -#: ../en/ch01-tour-basic.xml:453 1.1882 +#: ../en/ch01-tour-basic.xml:493 1.1883 msgid "" 1.1884 "The <command role=\"hg-cmd\">hg status</command> command prints no output for " 1.1885 "some files, but a line starting with <quote><literal>M</literal></quote> for " 1.1886 @@ -3193,7 +3251,7 @@ 1.1887 msgstr "" 1.1888 1.1889 #. type: Content of: <book><chapter><sect1><para> 1.1890 -#: ../en/ch01-tour-basic.xml:460 1.1891 +#: ../en/ch01-tour-basic.xml:500 1.1892 msgid "" 1.1893 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed " 1.1894 "that we modified <filename>hello.c</filename>. We didn't need to " 1.1895 @@ -3203,21 +3261,33 @@ 1.1896 msgstr "" 1.1897 1.1898 #. type: Content of: <book><chapter><sect1><para> 1.1899 -#: ../en/ch01-tour-basic.xml:468 1.1900 -msgid "" 1.1901 -"It's a little bit helpful to know that we've modified <filename>hello.c</" 1.1902 +#: ../en/ch01-tour-basic.xml:508 1.1903 +msgid "" 1.1904 +"It's somewhat helpful to know that we've modified <filename>hello.c</" 1.1905 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> " 1.1906 "changes we've made to it. To do this, we use the <command role=\"hg-cmd\">hg " 1.1907 "diff</command> command." 1.1908 msgstr "" 1.1909 1.1910 #. type: Content of: <book><chapter><sect1><title> 1.1911 -#: ../en/ch01-tour-basic.xml:478 1.1912 +#: ../en/ch01-tour-basic.xml:517 ../en/ch11-mq.xml:187 1.1913 +msgid "Understanding patches" 1.1914 +msgstr "理解补丁" 1.1915 + 1.1916 +#. type: Content of: <book><chapter><sect1><tip><para> 1.1917 +#: ../en/ch01-tour-basic.xml:519 1.1918 +msgid "" 1.1919 +"Remember to take a look at <xref linkend=\"sec:mq:patch\"/> if you don't know " 1.1920 +"how to read output above." 1.1921 +msgstr "" 1.1922 + 1.1923 +#. type: Content of: <book><chapter><sect1><title> 1.1924 +#: ../en/ch01-tour-basic.xml:525 1.1925 msgid "Recording changes in a new changeset" 1.1926 msgstr "在新修改集中记录修改" 1.1927 1.1928 #. type: Content of: <book><chapter><sect1><para> 1.1929 -#: ../en/ch01-tour-basic.xml:480 1.1930 +#: ../en/ch01-tour-basic.xml:527 1.1931 msgid "" 1.1932 "We can modify files, build and test our changes, and use <command role=\"hg-" 1.1933 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to " 1.1934 @@ -3226,7 +3296,7 @@ 1.1935 msgstr "" 1.1936 1.1937 #. type: Content of: <book><chapter><sect1><para> 1.1938 -#: ../en/ch01-tour-basic.xml:487 1.1939 +#: ../en/ch01-tour-basic.xml:534 1.1940 msgid "" 1.1941 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new " 1.1942 "changeset; we'll usually refer to this as <quote>making a commit</quote> or " 1.1943 @@ -3234,12 +3304,12 @@ 1.1944 msgstr "" 1.1945 1.1946 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1947 -#: ../en/ch01-tour-basic.xml:493 1.1948 +#: ../en/ch01-tour-basic.xml:540 1.1949 msgid "Setting up a username" 1.1950 msgstr "配置用户名称" 1.1951 1.1952 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1953 -#: ../en/ch01-tour-basic.xml:495 1.1954 +#: ../en/ch01-tour-basic.xml:542 1.1955 msgid "" 1.1956 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the " 1.1957 "first time, it is not guaranteed to succeed. Mercurial records your name and " 1.1958 @@ -3250,7 +3320,7 @@ 1.1959 msgstr "" 1.1960 1.1961 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.1962 -#: ../en/ch01-tour-basic.xml:504 1.1963 +#: ../en/ch01-tour-basic.xml:551 1.1964 msgid "" 1.1965 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the " 1.1966 "<command role=\"hg-cmd\">hg commit</command> command on the command line, " 1.1967 @@ -3258,14 +3328,14 @@ 1.1968 msgstr "" 1.1969 1.1970 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.1971 -#: ../en/ch01-tour-basic.xml:509 1.1972 +#: ../en/ch01-tour-basic.xml:556 1.1973 msgid "" 1.1974 "If you have set the <envar>HGUSER</envar> environment variable, this is " 1.1975 "checked next." 1.1976 msgstr "" 1.1977 1.1978 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.1979 -#: ../en/ch01-tour-basic.xml:512 1.1980 +#: ../en/ch01-tour-basic.xml:559 1.1981 msgid "" 1.1982 "If you create a file in your home directory called <filename role=\"special" 1.1983 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> " 1.1984 @@ -3274,14 +3344,14 @@ 1.1985 msgstr "" 1.1986 1.1987 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.1988 -#: ../en/ch01-tour-basic.xml:520 1.1989 +#: ../en/ch01-tour-basic.xml:567 1.1990 msgid "" 1.1991 "If you have set the <envar>EMAIL</envar> environment variable, this will be " 1.1992 "used next." 1.1993 msgstr "" 1.1994 1.1995 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.1996 -#: ../en/ch01-tour-basic.xml:523 1.1997 +#: ../en/ch01-tour-basic.xml:570 1.1998 msgid "" 1.1999 "Mercurial will query your system to find out your local user name and host " 1.2000 "name, and construct a username from these components. Since this often " 1.2001 @@ -3290,7 +3360,7 @@ 1.2002 msgstr "" 1.2003 1.2004 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2005 -#: ../en/ch01-tour-basic.xml:530 1.2006 +#: ../en/ch01-tour-basic.xml:577 1.2007 msgid "" 1.2008 "If all of these mechanisms fail, Mercurial will fail, printing an error " 1.2009 "message. In this case, it will not let you commit until you set up a " 1.2010 @@ -3298,7 +3368,7 @@ 1.2011 msgstr "" 1.2012 1.2013 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2014 -#: ../en/ch01-tour-basic.xml:534 1.2015 +#: ../en/ch01-tour-basic.xml:581 1.2016 msgid "" 1.2017 "You should think of the <envar>HGUSER</envar> environment variable and the " 1.2018 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-" 1.2019 @@ -3309,12 +3379,12 @@ 1.2020 msgstr "" 1.2021 1.2022 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.2023 -#: ../en/ch01-tour-basic.xml:543 1.2024 +#: ../en/ch01-tour-basic.xml:590 1.2025 msgid "Creating a Mercurial configuration file" 1.2026 msgstr "创建 Mercurial 的配置文件" 1.2027 1.2028 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.2029 -#: ../en/ch01-tour-basic.xml:545 1.2030 +#: ../en/ch01-tour-basic.xml:592 1.2031 msgid "" 1.2032 "To set a user name, use your favourite editor to create a file called " 1.2033 "<filename role=\"special\">.hgrc</filename> in your home directory. " 1.2034 @@ -3323,8 +3393,13 @@ 1.2035 "filename> should look like this." 1.2036 msgstr "" 1.2037 1.2038 +#. type: Content of: <book><chapter><sect1><sect2><sect3><remark> 1.2039 +#: ../en/ch01-tour-basic.xml:600 1.2040 +msgid "Figure out what the appropriate directory is on Windows." 1.2041 +msgstr "" 1.2042 + 1.2043 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.2044 -#: ../en/ch01-tour-basic.xml:557 1.2045 +#: ../en/ch01-tour-basic.xml:607 1.2046 msgid "" 1.2047 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</" 1.2048 "emphasis> of the config file, so you can read the <quote><literal>username " 1.2049 @@ -3336,21 +3411,21 @@ 1.2050 msgstr "" 1.2051 1.2052 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.2053 -#: ../en/ch01-tour-basic.xml:570 1.2054 +#: ../en/ch01-tour-basic.xml:620 1.2055 msgid "Choosing a user name" 1.2056 msgstr "选择用户名称" 1.2057 1.2058 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.2059 -#: ../en/ch01-tour-basic.xml:572 1.2060 +#: ../en/ch01-tour-basic.xml:622 1.2061 msgid "" 1.2062 "You can use any text you like as the value of the <literal>username</literal> " 1.2063 -"config item, since this information is for reading by other people, but for " 1.2064 -"interpreting by Mercurial. The convention that most people follow is to use " 1.2065 -"their name and email address, as in the example above." 1.2066 +"config item, since this information is for reading by other people, but will " 1.2067 +"not be interpreted by Mercurial. The convention that most people follow is " 1.2068 +"to use their name and email address, as in the example above." 1.2069 msgstr "" 1.2070 1.2071 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para> 1.2072 -#: ../en/ch01-tour-basic.xml:579 1.2073 +#: ../en/ch01-tour-basic.xml:629 1.2074 msgid "" 1.2075 "Mercurial's built-in web server obfuscates email addresses, to make it more " 1.2076 "difficult for the email harvesting tools that spammers use. This reduces the " 1.2077 @@ -3359,12 +3434,12 @@ 1.2078 msgstr "" 1.2079 1.2080 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2081 -#: ../en/ch01-tour-basic.xml:589 1.2082 +#: ../en/ch01-tour-basic.xml:639 1.2083 msgid "Writing a commit message" 1.2084 msgstr "写提交日志" 1.2085 1.2086 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2087 -#: ../en/ch01-tour-basic.xml:591 1.2088 +#: ../en/ch01-tour-basic.xml:641 1.2089 msgid "" 1.2090 "When we commit a change, Mercurial drops us into a text editor, to enter a " 1.2091 "message that will describe the modifications we've made in this changeset. " 1.2092 @@ -3374,15 +3449,15 @@ 1.2093 msgstr "" 1.2094 1.2095 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2096 -#: ../en/ch01-tour-basic.xml:601 1.2097 +#: ../en/ch01-tour-basic.xml:651 1.2098 msgid "" 1.2099 "The editor that the <command role=\"hg-cmd\">hg commit</command> command " 1.2100 -"drops us into will contain an empty line, followed by a number of lines " 1.2101 -"starting with <quote><literal>HG:</literal></quote>." 1.2102 -msgstr "" 1.2103 - 1.2104 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.2105 -#: ../en/ch01-tour-basic.xml:608 1.2106 +"drops us into will contain an empty line or two, followed by a number of " 1.2107 +"lines starting with <quote><literal>HG:</literal></quote>." 1.2108 +msgstr "" 1.2109 + 1.2110 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.2111 +#: ../en/ch01-tour-basic.xml:665 1.2112 msgid "" 1.2113 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></" 1.2114 "quote>; it uses them only to tell us which files it's recording changes to. " 1.2115 @@ -3390,12 +3465,12 @@ 1.2116 msgstr "" 1.2117 1.2118 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2119 -#: ../en/ch01-tour-basic.xml:614 1.2120 +#: ../en/ch01-tour-basic.xml:671 1.2121 msgid "Writing a good commit message" 1.2122 msgstr "写好提交日志" 1.2123 1.2124 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2125 -#: ../en/ch01-tour-basic.xml:616 1.2126 +#: ../en/ch01-tour-basic.xml:673 1.2127 msgid "" 1.2128 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of " 1.2129 "a commit message by default, it's best to write a commit message whose first " 1.2130 @@ -3405,7 +3480,7 @@ 1.2131 msgstr "" 1.2132 1.2133 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2134 -#: ../en/ch01-tour-basic.xml:630 1.2135 +#: ../en/ch01-tour-basic.xml:687 1.2136 msgid "" 1.2137 "As far as the remainder of the contents of the commit message are concerned, " 1.2138 "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care " 1.2139 @@ -3414,7 +3489,7 @@ 1.2140 msgstr "" 1.2141 1.2142 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2143 -#: ../en/ch01-tour-basic.xml:636 1.2144 +#: ../en/ch01-tour-basic.xml:693 1.2145 msgid "" 1.2146 "My personal preference is for short, but informative, commit messages that " 1.2147 "tell me something that I can't figure out with a quick glance at the output " 1.2148 @@ -3422,12 +3497,12 @@ 1.2149 msgstr "" 1.2150 1.2151 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2152 -#: ../en/ch01-tour-basic.xml:643 1.2153 +#: ../en/ch01-tour-basic.xml:700 1.2154 msgid "Aborting a commit" 1.2155 msgstr "终止提交" 1.2156 1.2157 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2158 -#: ../en/ch01-tour-basic.xml:645 1.2159 +#: ../en/ch01-tour-basic.xml:702 1.2160 msgid "" 1.2161 "If you decide that you don't want to commit while in the middle of editing a " 1.2162 "commit message, simply exit from your editor without saving the file that " 1.2163 @@ -3436,7 +3511,7 @@ 1.2164 msgstr "" 1.2165 1.2166 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2167 -#: ../en/ch01-tour-basic.xml:650 1.2168 +#: ../en/ch01-tour-basic.xml:707 1.2169 msgid "" 1.2170 "If we run the <command role=\"hg-cmd\">hg commit</command> command without " 1.2171 "any arguments, it records all of the changes we've made, as reported by " 1.2172 @@ -3445,12 +3520,12 @@ 1.2173 msgstr "" 1.2174 1.2175 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2176 -#: ../en/ch01-tour-basic.xml:657 1.2177 +#: ../en/ch01-tour-basic.xml:714 1.2178 msgid "Admiring our new handiwork" 1.2179 msgstr "欣赏我们的成果" 1.2180 1.2181 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2182 -#: ../en/ch01-tour-basic.xml:659 1.2183 +#: ../en/ch01-tour-basic.xml:716 1.2184 msgid "" 1.2185 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg " 1.2186 "tip</command> command to display the changeset we just created. This command " 1.2187 @@ -3459,19 +3534,30 @@ 1.2188 msgstr "" 1.2189 1.2190 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2191 -#: ../en/ch01-tour-basic.xml:668 1.2192 -msgid "" 1.2193 -"We refer to the newest revision in the repository as the tip revision, or " 1.2194 -"simply the tip." 1.2195 +#: ../en/ch01-tour-basic.xml:725 1.2196 +msgid "" 1.2197 +"We refer to the newest revision in the repository as the <emphasis>tip " 1.2198 +"revision</emphasis>, or simply the <emphasis>tip</emphasis>." 1.2199 +msgstr "" 1.2200 + 1.2201 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.2202 +#: ../en/ch01-tour-basic.xml:729 1.2203 +msgid "" 1.2204 +"By the way, the <command role=\"hg-cmd\">hg tip</command> command accepts " 1.2205 +"many of the same options as <command role=\"hg-cmd\">hg log</command>, so " 1.2206 +"<option role=\"hg-opt-global\">-v</option> above indicates <quote>be verbose</" 1.2207 +"quote>, <option role=\"hg-opt-tip\">-p</option> specifies <quote>print a " 1.2208 +"patch</quote>. The use of <option role=\"hg-opt-tip\">-p</option> to print " 1.2209 +"patches is another example of the consistent naming we mentioned earlier." 1.2210 msgstr "" 1.2211 1.2212 #. type: Content of: <book><chapter><sect1><title> 1.2213 -#: ../en/ch01-tour-basic.xml:675 1.2214 +#: ../en/ch01-tour-basic.xml:741 1.2215 msgid "Sharing changes" 1.2216 msgstr "共享修改" 1.2217 1.2218 #. type: Content of: <book><chapter><sect1><para> 1.2219 -#: ../en/ch01-tour-basic.xml:677 1.2220 +#: ../en/ch01-tour-basic.xml:743 1.2221 msgid "" 1.2222 "We mentioned earlier that repositories in Mercurial are self-contained. This " 1.2223 "means that the changeset we just created exists only in our <filename class=" 1.2224 @@ -3480,12 +3566,12 @@ 1.2225 msgstr "" 1.2226 1.2227 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2228 -#: ../en/ch01-tour-basic.xml:685 1.2229 +#: ../en/ch01-tour-basic.xml:751 1.2230 msgid "Pulling changes from another repository" 1.2231 msgstr "从其它版本库取得修改" 1.2232 1.2233 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2234 -#: ../en/ch01-tour-basic.xml:686 1.2235 +#: ../en/ch01-tour-basic.xml:752 1.2236 msgid "" 1.2237 "To get started, let's clone our original <filename class=\"directory\">hello</" 1.2238 "filename> repository, which does not contain the change we just committed. " 1.2239 @@ -3494,7 +3580,7 @@ 1.2240 msgstr "" 1.2241 1.2242 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2243 -#: ../en/ch01-tour-basic.xml:694 1.2244 +#: ../en/ch01-tour-basic.xml:760 1.2245 msgid "" 1.2246 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring " 1.2247 "changes from <filename class=\"directory\">my-hello</filename> into <filename " 1.2248 @@ -3507,16 +3593,18 @@ 1.2249 msgstr "" 1.2250 1.2251 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2252 -#: ../en/ch01-tour-basic.xml:707 1.2253 -msgid "" 1.2254 -"(Of course, someone could cause more changesets to appear in the repository " 1.2255 -"that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get " 1.2256 -"a chance to <command role=\"hg-cmd\">hg pull</command> the changes, so that " 1.2257 -"we could end up pulling changes that we didn't expect.)" 1.2258 -msgstr "" 1.2259 - 1.2260 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.2261 -#: ../en/ch01-tour-basic.xml:714 1.2262 +#: ../en/ch01-tour-basic.xml:773 1.2263 +msgid "" 1.2264 +"Suppose you're pulling changes from a repository on the network somewhere. " 1.2265 +"While you are looking at the <command role=\"hg-cmd\">hg incoming</command> " 1.2266 +"output, and before you pull those changes, someone might have committed " 1.2267 +"something in the remote repository. This means that it's possible to pull " 1.2268 +"more changes than you saw when using <command role=\"hg-cmd\">hg incoming</" 1.2269 +"command>." 1.2270 +msgstr "" 1.2271 + 1.2272 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.2273 +#: ../en/ch01-tour-basic.xml:781 1.2274 msgid "" 1.2275 "Bringing changes into a repository is a simple matter of running the <command " 1.2276 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to " 1.2277 @@ -3524,7 +3612,7 @@ 1.2278 msgstr "" 1.2279 1.2280 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2281 -#: ../en/ch01-tour-basic.xml:721 1.2282 +#: ../en/ch01-tour-basic.xml:788 1.2283 msgid "" 1.2284 "As you can see from the before-and-after output of <command role=\"hg-cmd" 1.2285 "\">hg tip</command>, we have successfully pulled changes into our " 1.2286 @@ -3533,12 +3621,12 @@ 1.2287 msgstr "" 1.2288 1.2289 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2290 -#: ../en/ch01-tour-basic.xml:729 1.2291 +#: ../en/ch01-tour-basic.xml:796 1.2292 msgid "Updating the working directory" 1.2293 msgstr "更新工作目录" 1.2294 1.2295 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2296 -#: ../en/ch01-tour-basic.xml:731 1.2297 +#: ../en/ch01-tour-basic.xml:798 1.2298 msgid "" 1.2299 "We have so far glossed over the relationship between a repository and its " 1.2300 "working directory. The <command role=\"hg-cmd\">hg pull</command> command " 1.2301 @@ -3550,21 +3638,21 @@ 1.2302 msgstr "" 1.2303 1.2304 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2305 -#: ../en/ch01-tour-basic.xml:743 1.2306 +#: ../en/ch01-tour-basic.xml:810 1.2307 msgid "" 1.2308 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> " 1.2309 "doesn't update the working directory automatically. There's actually a good " 1.2310 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to " 1.2311 "update the working directory to the state it was in at <emphasis>any " 1.2312 "revision</emphasis> in the history of the repository. If you had the working " 1.2313 -"directory updated to an old revision---to hunt down the origin of a bug, " 1.2314 -"say---and ran a <command role=\"hg-cmd\">hg pull</command> which " 1.2315 -"automatically updated the working directory to a new revision, you might not " 1.2316 -"be terribly happy." 1.2317 -msgstr "" 1.2318 - 1.2319 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.2320 -#: ../en/ch01-tour-basic.xml:754 1.2321 +"directory updated to an old revision—to hunt down the origin of a bug, say—" 1.2322 +"and ran a <command role=\"hg-cmd\">hg pull</command> which automatically " 1.2323 +"updated the working directory to a new revision, you might not be terribly " 1.2324 +"happy." 1.2325 +msgstr "" 1.2326 + 1.2327 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.2328 +#: ../en/ch01-tour-basic.xml:821 1.2329 msgid "" 1.2330 "However, since pull-then-update is such a common thing to do, Mercurial lets " 1.2331 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> " 1.2332 @@ -3572,7 +3660,7 @@ 1.2333 msgstr "" 1.2334 1.2335 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2336 -#: ../en/ch01-tour-basic.xml:759 1.2337 +#: ../en/ch01-tour-basic.xml:826 1.2338 msgid "" 1.2339 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> " 1.2340 "in <xref linkend=\"sec:tour:pull\"/> when we ran it without <option role=\"hg-" 1.2341 @@ -3581,14 +3669,14 @@ 1.2342 msgstr "" 1.2343 1.2344 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2345 -#: ../en/ch01-tour-basic.xml:768 1.2346 +#: ../en/ch01-tour-basic.xml:835 1.2347 msgid "" 1.2348 "To find out what revision the working directory is at, use the <command role=" 1.2349 "\"hg-cmd\">hg parents</command> command." 1.2350 msgstr "" 1.2351 1.2352 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2353 -#: ../en/ch01-tour-basic.xml:774 1.2354 +#: ../en/ch01-tour-basic.xml:841 1.2355 msgid "" 1.2356 "If you look back at <xref linkend=\"fig:tour-basic:history\"/>, you'll see " 1.2357 "arrows connecting each changeset. The node that the arrow leads " 1.2358 @@ -3599,7 +3687,7 @@ 1.2359 msgstr "" 1.2360 1.2361 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2362 -#: ../en/ch01-tour-basic.xml:783 1.2363 +#: ../en/ch01-tour-basic.xml:850 1.2364 msgid "" 1.2365 "To update the working directory to a particular revision, give a revision " 1.2366 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> " 1.2367 @@ -3607,7 +3695,7 @@ 1.2368 msgstr "" 1.2369 1.2370 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2371 -#: ../en/ch01-tour-basic.xml:790 1.2372 +#: ../en/ch01-tour-basic.xml:857 1.2373 msgid "" 1.2374 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</" 1.2375 "command> will update to the tip revision, as shown by the second call to " 1.2376 @@ -3615,12 +3703,12 @@ 1.2377 msgstr "" 1.2378 1.2379 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2380 -#: ../en/ch01-tour-basic.xml:798 1.2381 +#: ../en/ch01-tour-basic.xml:865 1.2382 msgid "Pushing changes to another repository" 1.2383 msgstr "发布修改到其它版本库" 1.2384 1.2385 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2386 -#: ../en/ch01-tour-basic.xml:800 1.2387 +#: ../en/ch01-tour-basic.xml:867 1.2388 msgid "" 1.2389 "Mercurial lets us push changes to another repository, from the repository " 1.2390 "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg " 1.2391 @@ -3629,44 +3717,47 @@ 1.2392 msgstr "" 1.2393 1.2394 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2395 -#: ../en/ch01-tour-basic.xml:808 1.2396 +#: ../en/ch01-tour-basic.xml:875 1.2397 msgid "" 1.2398 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what " 1.2399 "changes would be pushed into another repository." 1.2400 msgstr "" 1.2401 1.2402 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2403 -#: ../en/ch01-tour-basic.xml:814 1.2404 +#: ../en/ch01-tour-basic.xml:881 1.2405 msgid "" 1.2406 "And the <command role=\"hg-cmd\">hg push</command> command does the actual " 1.2407 "push." 1.2408 msgstr "" 1.2409 1.2410 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2411 -#: ../en/ch01-tour-basic.xml:820 1.2412 +#: ../en/ch01-tour-basic.xml:887 1.2413 msgid "" 1.2414 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd" 1.2415 "\">hg push</command> command does not update the working directory in the " 1.2416 -"repository that it's pushing changes into. (Unlike <command role=\"hg-cmd" 1.2417 -"\">hg pull</command>, <command role=\"hg-cmd\">hg push</command> does not " 1.2418 -"provide a <literal>-u</literal> option that updates the other repository's " 1.2419 -"working directory.)" 1.2420 -msgstr "" 1.2421 - 1.2422 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.2423 -#: ../en/ch01-tour-basic.xml:829 1.2424 +"repository that it's pushing changes into. Unlike <command role=\"hg-cmd\">hg " 1.2425 +"pull</command>, <command role=\"hg-cmd\">hg push</command> does not provide a " 1.2426 +"<literal>-u</literal> option that updates the other repository's working " 1.2427 +"directory. This asymmetry is deliberate: the repository we're pushing to " 1.2428 +"might be on a remote server and shared between several people. If we were to " 1.2429 +"update its working directory while someone was working in it, their work " 1.2430 +"would be disrupted." 1.2431 +msgstr "" 1.2432 + 1.2433 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.2434 +#: ../en/ch01-tour-basic.xml:899 1.2435 msgid "" 1.2436 "What happens if we try to pull or push changes and the receiving repository " 1.2437 "already has those changes? Nothing too exciting." 1.2438 msgstr "" 1.2439 1.2440 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2441 -#: ../en/ch01-tour-basic.xml:836 1.2442 +#: ../en/ch01-tour-basic.xml:906 1.2443 msgid "Sharing changes over a network" 1.2444 msgstr "通过网络共享修改" 1.2445 1.2446 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2447 -#: ../en/ch01-tour-basic.xml:838 1.2448 +#: ../en/ch01-tour-basic.xml:908 1.2449 msgid "" 1.2450 "The commands we have covered in the previous few sections are not limited to " 1.2451 "working with local repositories. Each works in exactly the same fashion over " 1.2452 @@ -3674,7 +3765,7 @@ 1.2453 msgstr "" 1.2454 1.2455 #. type: Content of: <book><chapter><sect1><sect2><para> 1.2456 -#: ../en/ch01-tour-basic.xml:846 1.2457 +#: ../en/ch01-tour-basic.xml:916 1.2458 msgid "" 1.2459 "In this example, we can see what changes we could push to the remote " 1.2460 "repository, but the repository is understandably not set up to let anonymous " 1.2461 @@ -5393,6 +5484,7 @@ 1.2462 1.2463 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2464 #: ../en/ch04-daily.xml:198 1.2465 +#, fuzzy 1.2466 msgid "Useful shorthand—adding and removing files in one step" 1.2467 msgstr "有用的速记—一个步骤添加和删除文件" 1.2468 1.2469 @@ -8521,6 +8613,7 @@ 1.2470 1.2471 #. type: Content of: <book><chapter><sect1><title> 1.2472 #: ../en/ch07-branch.xml:228 1.2473 +#, fuzzy 1.2474 msgid "The flow of changes—big picture vs. little" 1.2475 msgstr "修改流程—宏观与微观" 1.2476 1.2477 @@ -11185,6 +11278,7 @@ 1.2478 1.2479 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2480 #: ../en/ch09-hook.xml:716 1.2481 +#, fuzzy 1.2482 msgid "" 1.2483 "<literal role=\"hg-ext\">acl</literal>—access control for parts of a " 1.2484 "repository" 1.2485 @@ -11333,6 +11427,7 @@ 1.2486 1.2487 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2488 #: ../en/ch09-hook.xml:844 1.2489 +#, fuzzy 1.2490 msgid "<literal role=\"hg-ext\">bugzilla</literal>—integration with Bugzilla" 1.2491 msgstr "<literal role=\"hg-ext\">bugzilla</literal>—与 Bugzilla 的集成" 1.2492 1.2493 @@ -11665,6 +11760,7 @@ 1.2494 1.2495 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2496 #: ../en/ch09-hook.xml:1150 1.2497 +#, fuzzy 1.2498 msgid "<literal role=\"hg-ext\">notify</literal>—send email notifications" 1.2499 msgstr "<literal role=\"hg-ext\">notify</literal>—邮件通知" 1.2500 1.2501 @@ -11989,6 +12085,7 @@ 1.2502 1.2503 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.2504 #: ../en/ch09-hook.xml:1431 1.2505 +#, fuzzy 1.2506 msgid "Where changes are going—remote repository URLs" 1.2507 msgstr "修改集要到哪里—远程版本库的地址" 1.2508 1.2509 @@ -12038,6 +12135,7 @@ 1.2510 1.2511 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2512 #: ../en/ch09-hook.xml:1473 1.2513 +#, fuzzy 1.2514 msgid "" 1.2515 "<literal role=\"hook\">changegroup</literal>—after remote changesets added" 1.2516 msgstr "<literal role=\"hook\">changegroup</literal>—增加远程修改集之后" 1.2517 @@ -12106,6 +12204,7 @@ 1.2518 1.2519 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2520 #: ../en/ch09-hook.xml:1526 1.2521 +#, fuzzy 1.2522 msgid "<literal role=\"hook\">commit</literal>—after a new changeset is created" 1.2523 msgstr "<literal role=\"hook\">commit</literal>—创建新修改集之后" 1.2524 1.2525 @@ -12145,6 +12244,7 @@ 1.2526 1.2527 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2528 #: ../en/ch09-hook.xml:1559 1.2529 +#, fuzzy 1.2530 msgid "" 1.2531 "<literal role=\"hook\">incoming</literal>—after one remote changeset is added" 1.2532 msgstr "<literal role=\"hook\">incoming</literal>—增加远程修改集之后" 1.2533 @@ -12185,6 +12285,7 @@ 1.2534 1.2535 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2536 #: ../en/ch09-hook.xml:1605 1.2537 +#, fuzzy 1.2538 msgid "" 1.2539 "<literal role=\"hook\">outgoing</literal>—after changesets are propagated" 1.2540 msgstr "<literal role=\"hook\">outgoing</literal>—传播修改集之后" 1.2541 @@ -12232,6 +12333,7 @@ 1.2542 1.2543 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2544 #: ../en/ch09-hook.xml:1652 1.2545 +#, fuzzy 1.2546 msgid "" 1.2547 "<literal role=\"hook\">prechangegroup</literal>—before starting to add remote " 1.2548 "changesets" 1.2549 @@ -12272,6 +12374,7 @@ 1.2550 1.2551 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2552 #: ../en/ch09-hook.xml:1698 1.2553 +#, fuzzy 1.2554 msgid "" 1.2555 "<literal role=\"hook\">precommit</literal>—before starting to commit a " 1.2556 "changeset" 1.2557 @@ -12324,6 +12427,7 @@ 1.2558 1.2559 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2560 #: ../en/ch09-hook.xml:1738 1.2561 +#, fuzzy 1.2562 msgid "" 1.2563 "<literal role=\"hook\">preoutgoing</literal>—before starting to propagate " 1.2564 "changesets" 1.2565 @@ -12362,6 +12466,7 @@ 1.2566 1.2567 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2568 #: ../en/ch09-hook.xml:1775 1.2569 +#, fuzzy 1.2570 msgid "<literal role=\"hook\">pretag</literal>—before tagging a changeset" 1.2571 msgstr "<literal role=\"hook\">pretag</literal>—创建标签之前" 1.2572 1.2573 @@ -12411,6 +12516,7 @@ 1.2574 1.2575 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2576 #: ../en/ch09-hook.xml:1815 1.2577 +#, fuzzy 1.2578 msgid "" 1.2579 "<literal role=\"hook\">pretxnchangegroup</literal>—before completing addition " 1.2580 "of remote changesets" 1.2581 @@ -12463,6 +12569,7 @@ 1.2582 1.2583 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2584 #: ../en/ch09-hook.xml:1881 1.2585 +#, fuzzy 1.2586 msgid "" 1.2587 "<literal role=\"hook\">pretxncommit</literal>—before completing commit of new " 1.2588 "changeset" 1.2589 @@ -12505,6 +12612,7 @@ 1.2590 1.2591 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2592 #: ../en/ch09-hook.xml:1929 1.2593 +#, fuzzy 1.2594 msgid "" 1.2595 "<literal role=\"hook\">preupdate</literal>—before updating or merging working " 1.2596 "directory" 1.2597 @@ -12544,6 +12652,7 @@ 1.2598 1.2599 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2600 #: ../en/ch09-hook.xml:1961 1.2601 +#, fuzzy 1.2602 msgid "<literal role=\"hook\">tag</literal>—after tagging a changeset" 1.2603 msgstr "<literal role=\"hook\">tag</literal>—创建标签之后" 1.2604 1.2605 @@ -12592,6 +12701,7 @@ 1.2606 1.2607 #. type: Content of: <book><chapter><sect1><sect2><title> 1.2608 #: ../en/ch09-hook.xml:1998 1.2609 +#, fuzzy 1.2610 msgid "" 1.2611 "<literal role=\"hook\">update</literal>—after updating or merging working " 1.2612 "directory" 1.2613 @@ -13787,11 +13897,6 @@ 1.2614 "particular line of a source file. And so on." 1.2615 msgstr "" 1.2616 1.2617 -#. type: Content of: <book><chapter><sect1><title> 1.2618 -#: ../en/ch11-mq.xml:187 1.2619 -msgid "Understanding patches" 1.2620 -msgstr "理解补丁" 1.2621 - 1.2622 #. type: Content of: <book><chapter><sect1><para> 1.2623 #: ../en/ch11-mq.xml:189 1.2624 msgid ""