[svnbook] r5344 committed - branches/1.8/zh/book/ch03-advanced-topics.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5344
          http://sourceforge.net/p/svnbook/source/5344
Author:   wuzhouhui
Date:     2017-07-02 05:03:12 +0000 (Sun, 02 Jul 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 3 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch03-advanced-topics.xml

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-01 07:46:20 UTC (rev 5343)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-02 05:03:12 UTC (rev 5344)
@@ -471,7 +471,7 @@
     <!--
     <title>Peg and Operative Revisions</title>
     -->
-    <title>挂勾版本号与活动版本号</title>
+    <title>挂勾版本号与实施版本号</title>
 
     <!--
     <para>We copy, move, rename, and completely replace files and
@@ -563,6 +563,7 @@
       为 <filename>frabnaggilywort</filename>. 开始接着进行, Frabnaggilywort
       发布了 1.0 版, 很多用户都下载了并在日常工作中使用它.</para>
     
+    <!--
     <para>It's a nice story, really, but it doesn't end there.
       Entrepreneur that you are, you've already got another think in
       the tank.  So you make a new directory,
@@ -575,7 +576,17 @@
       <filename>concept</filename> to something else for a while, but
       later rename the thing back to <filename>concept</filename> for
       some reason.</para>
+    -->
+    <para>故事听起来还不错, 但是还没结束. 企业家的脑子里经常会有新想法出现,
+      于是你又创建了一个新目录 <filename>concept</filename>, 循环再次开始.
+      实际上, 在几年内循环会重复进行多次, 每一次都以创建
+      <filename>concept</filename> 开始, 如果想法逐渐地明朗起来,
+      <filename>concept</filename> 很可能会被重新命名; 如果想法被否定了,
+      <filename>concept</filename> 就会被删除. 更有甚者, 用户还有可能把
+      <filename>concept</filename> 改名一段时间后, 又改回到
+      <filename>concept</filename>.</para>
 
+    <!--
     <para>In scenarios like these, attempting to instruct
       Subversion to work with these reused paths can be a little like
       instructing a motorist in Chicago's West Suburbs to drive east
@@ -584,6 +595,13 @@
       Wheaton, Glen Ellyn, and Lombard.  And no, they aren't the same
       street.  Our motorist—and our Subversion—need a
       little more detail to do the right thing.</para>
+    -->
+    <para>在这种场景下, 指挥 Subversion 操作这些重复使用的路径就好像在指挥
+      一个摩托车手, 从芝加哥的 West Suburbs 向东行驶到 Roosevelt Road, 再向
+      左驶入 Main Street. 在短短的 20 分钟里, 你会穿过 Wheaton, Glen Ellyn 和
+      Lombard 的 <quote>Main Street</quote>, 但它们并非是同一个地方, 我们的
+      摩托车手—也就是 Subversion—需要更多的细节才能把事情做对.
+    </para>
 
     <para>
       <indexterm>
@@ -596,7 +614,9 @@
       <indexterm>
         <primary>@</primary>
         <see>at syntax</see>
-      </indexterm>Fortunately, Subversion allows you to tell it
+      </indexterm>
+    <!--
+      Fortunately, Subversion allows you to tell it
       exactly which Main Street you meant.  The mechanism used is
       called a <firstterm>peg revision</firstterm>, and you provide
       these to Subversion for the sole purpose of identifying unique
@@ -609,6 +629,16 @@
       called because the syntax involves appending an <quote>at
       sign</quote> (<literal>@</literal>) and the peg revision to the
       end of the path with which the revision is associated.</para>
+    -->
+    幸运的是, Subversion 允许用户精确地指定他想去的是哪一个 Main Street, 其中
+    用到的特性是 <firstterm>挂勾版本号</firstterm>
+    (<firstterm>peg revision</firstterm>), 它的目的是确定一条唯一的历史线.
+    因为在任意一个给定的时刻 (或者说给定的版本号) 一条路径上至多只能有一个版
+    本控制对象, 所以说结合使用路径与挂勾版本号就可以明确地识别一条特定的
+    历史线. 挂勾版本号使用 <firstterm>at 语法</firstterm>
+    (<firstterm>at syntax</firstterm>) 在 Subversion 的命令行客户端工具上
+    指定, 之所以叫作 <quote>at 语法</quote> 是因为指定版本号的方式是在路径
+    的末尾加上符号 <literal>@</literal>, 然后再写上版本号.</para>
 
     <para>
       <indexterm>
@@ -618,7 +648,9 @@
       <indexterm>
         <primary>revisions</primary>
         <secondary>operative revision range</secondary>
-      </indexterm>But what of the <option>--revision</option>
+      </indexterm>
+    <!--
+      But what of the <option>- -revision</option>
       (<option>-r</option>) of which we've spoken so much in this
       book?  That revision (or set of revisions) is called the
       <firstterm>operative revision</firstterm> (or
@@ -638,6 +670,19 @@
       throw in <quote>606 N.</quote> as our operative revision of
       sorts, and we know <emphasis>exactly</emphasis> where to
       go.</para>
+    -->
+    但是本书多次提到的 <option>--revision</option> (<option>-r</option>) 到底
+    是什么? 这个版本号或版本号集合叫作 <firstterm>实施版本号</firstterm>
+    (<firstterm>operative revision</firstterm>) 或
+    <firstterm>实施版本号范围</firstterm> (<firstterm>operative revision range
+    </firstterm>). 一旦用路径和挂勾版本号确定一条特定的历史线, Subversion 就
+    对实施版本号执行用户请求的操作. 用芝加哥的道路进行类比, 如果我们要去
+    Wheaton 的 606 N. Main Street<footnote><para>把 606 N. Main Street 作为
+        Wheaton 的历史中心应该是比较恰当的.</para></footnote>, 可以把
+    <quote>Main Street</quote> 看成路径, 把 <quote>Wheaton</quote> 看成挂勾
+    版本号, 这两项信息确定了一条唯一的路径, 避免我们走弯路. 现在我们把
+    <quote>606 N.</quote> 作为实施版本号, 最终我们得到了一个精确的目的地.
+  </para>
 
     <sidebar id="svn.advanced.pegrevs.algorithm">
       <title>The Peg Revision Algorithm</title>