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

[wuzhouhui at users.sourceforge.net]

Revision: 5341
          http://sourceforge.net/p/svnbook/source/5341
Author:   wuzhouhui
Date:     2017-06-29 14:43:05 +0000 (Thu, 29 Jun 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-06-28 13:47:54 UTC (rev 5340)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-06-29 14:43:05 UTC (rev 5341)
@@ -145,7 +145,10 @@
     
     <!-- =============================================================== -->
     <sect2 id="svn.tour.revs.keywords">
+    <!--
       <title>Revision Keywords</title>
+    -->
+      <title>版本号关键字</title>
        
       <indexterm>
         <primary>revisions</primary>
@@ -152,11 +155,16 @@
         <secondary>keywords</secondary>
       </indexterm>
 
+    <!--
       <para>The Subversion client understands a number of revision
         keywords.  These keywords can be used instead of integer
-        arguments to the <option>--revision</option>
+        arguments to the <option>- -revision</option>
         (<option>-r</option>) option, and are resolved into specific
         revision numbers by Subversion:</para>
+    -->
+      <para>Subversion 可以理解的版本号关键字有很多个, 可以用这些关键字替换
+        选项 <option>--revision</option> (<option>-r</option>) 后面的整数,
+        这些关键字会被 Subversion 解释成特定的版本号:</para>
 
       <variablelist>
         
@@ -171,8 +179,11 @@
               <secondary>keywords</secondary>
               <tertiary>HEAD</tertiary>
             </indexterm>
+    <!--
             <para>The latest (or <quote>youngest</quote>) revision in
               the repository.</para>
+    -->
+            <para>仓库中最近的 (或最年轻的) 版本号.</para>
           </listitem>
         </varlistentry>
         
@@ -187,10 +198,14 @@
               <secondary>keywords</secondary>
               <tertiary>BASE</tertiary>
             </indexterm>
+    <!--
             <para>The revision number of an item in a working copy.
               If the item has been locally modified, this refers to
               the way the item appears without those local
               modifications.</para>
+    -->
+            <para>工作副本中的某一项目的版本号, 如果该项在本地被修改了, 则该
+              版本号引用的是修改前的项目.</para>
           </listitem>
         </varlistentry>
         
@@ -205,8 +220,12 @@
               <secondary>keywords</secondary>
               <tertiary>COMMITTED</tertiary>
             </indexterm>
+    <!--
             <para>The most recent revision prior to, or equal to,
               <literal>BASE</literal>, in which an item changed.</para>
+    -->
+            <para>等于或早于 <literal>BASE</literal> 并且离它最近的一个版本号,
+              在该版本号中项目被修改了.</para>
           </listitem>
         </varlistentry>
         
@@ -221,15 +240,20 @@
               <secondary>keywords</secondary>
               <tertiary>PREV</tertiary>
             </indexterm>
+    <!--
             <para>The revision immediately <emphasis>before</emphasis>
               the last revision in which an item changed.
               Technically, this boils down to
               <literal>COMMITTED</literal>-1.</para>
+    -->
+          <para>项目最后一次被修改时的版本号的前一个版本号, 从技术上讲它
+          就是 <literal>COMMITTED</literal>-1.</para>
           </listitem>
         </varlistentry>
         
       </variablelist>
 
+    <!--
       <para>As can be derived from their descriptions, the
         <literal>PREV</literal>, <literal>BASE</literal>, and
         <literal>COMMITTED</literal> revision keywords are used only
@@ -237,9 +261,17 @@
         to repository URLs.  <literal>HEAD</literal>, on the other
         hand, can be used in conjunction with both of these path
         types.</para>
+    -->
+      <para>从它们的描述可以看出, <literal>PREV</literal>,
+        <literal>BASE</literal> 和 <literal>COMMITTED</literal> 只能引用工作
+        副本中的路径, 而 <literal>HEAD</literal> 既可以引用工作副本中的路径,
+        也可以引用仓库的 URL.</para>
       
+    <!--
       <para>Here are some examples of revision keywords in
         action:</para>
+    -->
+      <para>下面是一些版本号关键字的使用示例:</para>
       
       <informalexample>
         <screen>
@@ -274,7 +306,10 @@
     
     <!-- =============================================================== -->
     <sect2 id="svn.tour.revs.dates">
+    <!--
       <title>Revision Dates</title>
+    -->
+      <title>版本号日期</title>
       
       <indexterm>
         <primary>revisions</primary>
@@ -290,6 +325,9 @@
         <literal>}</literal>).  Subversion accepts the standard
         ISO-8601 date and time formats, plus a few others.  Here are
         some examples.</para>
+      <para>版本号没有透露出一丝一毫与版本控制系统外部世界相关的信息, 但是有
+        时候你需要把真实世界的时间与版本控制历史的时间联系起来. 为此, 选项
+        <option>--revision</option> (<option>-r</option>) 也支持</para>
 
       <informalexample>
         <screen>