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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Wed Jun 28 08:47:55 CDT 2017


Revision: 5340
          http://sourceforge.net/p/svnbook/source/5340
Author:   wuzhouhui
Date:     2017-06-28 13:47:54 +0000 (Wed, 28 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 03:51:20 UTC (rev 5339)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-06-28 13:47:54 UTC (rev 5340)
@@ -55,8 +55,12 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.tour.revs.specifiers">
+    <!--
     <title>Revision Specifiers</title>
+    -->
+    <title>版本号指示器</title>
 
+    <!--
     <para>As we described in <xref linkend="svn.basic.in-action.revs"
       />, revision numbers in Subversion are pretty
       straightforward—integers that keep getting larger as you
@@ -70,8 +74,16 @@
       in a commit email, in the output of some other Subversion
       operation, or in some other context that would give meaning to
       that particular number.</para>
+    -->
+    <para>我们已经在 <xref linkend="svn.basic.in-action.revs"/> 说过,
+      Subversion 的版本号非常直观—随着提交的不断增多, 表示版本号的整数
+      也不断增大, 但是用不了多久, 用户就再也记不清每个版本号包含了哪些修改.
+      幸运的是, Subversion 的典型工作流程不太经常要求用户提供版本号, 对于
+      那些确实需要版本号的操作而言, 用户可以从提交日志中看到所需的版本号, 或者
+      使用在特定语境下可以表示特定版本号的关键字.</para>
 
     <note>
+    <!--
       <para>Referring to revision numbers with
         an <quote><literal>r</literal></quote> prefix
         (<literal>r314</literal>, for example) is an established
@@ -81,6 +93,12 @@
         line, you may also use
         the <literal>r</literal><replaceable>NNN</replaceable>
         syntax.</para>
+    -->
+      <para>在引用版本号时, 在数字的左边增加一个前缀
+        <quote><literal>r</literal></quote> (例如 <literal>r314</literal>)
+        是 Subversion 社区约定俗成的做法, 很多 Subversion 的相关工具都鼓励
+        这种写法. 在需要提供裸版本号的大多数场合中, 你也可以使用
+        <literal>r</literal><replaceable>NNN</replaceable> 形式的语法.</para>
     </note>
 
     <para>
@@ -87,14 +105,23 @@
       <indexterm>
         <primary>revisions</primary>
         <secondary>keywords</secondary>
-      </indexterm>But occasionally, you need to pinpoint a moment in
+      </indexterm>
+    <!--
+      TODO
+      But occasionally, you need to pinpoint a moment in
       time for which you don't already have a revision number
       memorized or handy.  So besides the integer revision numbers,
       <command>svn</command> allows as input some additional forms of
       revision specifiers: <firstterm>revision keywords</firstterm>
       and revision dates.</para>
+    -->
+    但是在少数情况下, 用户必须精确及时地指出版本号, 但手上却没有合适的参数.
+    所以除了用整数指定版本号, <command>svn</command> 还支持另外两种指定版本
+    号的形式: <firstterm>版本号关键字</firstterm>
+    (<firstterm>revision keywords</firstterm>) 和版本号日期.</para>
 
     <note>
+    <!--
       <para>The various forms of Subversion revision specifiers can be
         mixed and matched when used to specify revision ranges.  For
         example, you can use <option>-r
@@ -106,6 +133,14 @@
         on.  The individual revision specifiers are independently
         evaluated, so you can put whatever you want on the opposite
         sides of that colon.</para>
+    -->
+      <para>在指定版本号范围时, 可以混合使用不同形式的版本号指示器, 例如你可
+        以把 <option>-r<replaceable>REV1</replaceable>:<replaceable>REV2
+        </replaceable></option> 的 <replaceable>REV1</replaceable> 写成
+        版本号关键字, 把 <replaceable>REV2</replaceable> 写成整数, 或者把
+        <replaceable>REV1</replaceable> 写成日期, 把 <replaceable>REV2
+        </replaceable> 写成版本号关键字, 如此等等. 每个版本号指示器被单独求值,
+        所以你可以把任意形式的版本号指示器放在冒号的两边.</para>
     </note>
     
     <!-- =============================================================== -->




More information about the svnbook-dev mailing list