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

[wuzhouhui at users.sourceforge.net]

Revision: 5420
          http://sourceforge.net/p/svnbook/source/5420
Author:   wuzhouhui
Date:     2017-09-07 12:50:14 +0000 (Thu, 07 Sep 2017)
Log Message:
-----------
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-09-06 14:22:00 UTC (rev 5419)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-09-07 12:50:14 UTC (rev 5420)
@@ -8064,10 +8064,15 @@
 </screen>
       </informalexample>
 
+    <!--
       <para>And when it's time to commit, Harry can again use the
-        <option>--changelist</option> option to limit the scope of the
+        <option>- -changelist</option> option to limit the scope of the
         commit to files in a certain changelist.  He might commit his
         user interface fix by doing the following:</para>
+    -->
+      <para>准备提交时, Harry 可以再次使用选项 <option>--changelist</option>
+        把提交操作的作用域限定到具有特定变更列表的文件上. 他可以像下面这样提交
+        用户接口的修改:</para>
 
       <informalexample>
         <screen>
@@ -8080,15 +8085,22 @@
 </screen>
       </informalexample>
 
+    <!--
       <para>In fact, the <command>svn commit</command> command
         provides a second changelists-related option:
-        <option>--keep-changelists</option>.  Normally, changelist
+        <option>- -keep-changelists</option>.  Normally, changelist
         assignments are removed from files after they are committed.
-        But if <option>--keep-changelists</option> is provided,
+        But if <option>- -keep-changelists</option> is provided,
         Subversion will leave the changelist assignment on the
         committed (and now unmodified) files.  In any case, committing
         files assigned to one changelist leaves other changelists
         undisturbed.</para>
+    -->
+      <para>实际上 <command>svn commit</command> 还提供了另一个和变更列表相关
+        的选项: <option>--keep-changelists</option>. 一般情况下, 在文件提交后,
+        变更列表就会从文件上移除, 但是如果提供了选项 <option>--keep-changelists
+        </option>, Subversion 就会把变更列表保留在提交了的文件上. 在任何一种
+        情况下, 提交某个变更列表的文件, 不会对其他变更列表产生影响.</para>
 
       <informalexample>
         <screen>
@@ -8102,7 +8114,8 @@
       </informalexample>
 
       <note>
-        <para>The <option>--changelist</option> option acts only as a
+    <!--
+        <para>The <option>- -changelist</option> option acts only as a
           filter for Subversion command targets, and will not add
           targets to an operation.  For example, on a commit operation
           specified as <userinput>svn commit /path/to/dir</userinput>, the
@@ -8116,6 +8129,15 @@
           <filename>/path/to/another-dir</filename>), regardless of
           their changelist assignment, even if they are part of the
           same working copy as the operation's target(s).</para>
+    -->
+        <para>选项 <option>--changelist</option> 只是作为命令的操作目标的过滤
+          器, 它不会向命令添加更多的操作目标. 举个例子, 命令 <userinput>
+            svn commit /path/to/dir</userinput> 的操作目标是目录 <filename>
+            /path/to/dir</filename> 及其子文件, 如果再向命令添加一个变更列表,
+          那么只有位于 <filename>/path/to/dir</filename> 目录内的, 且分配了
+          相应变更列表的文件才会被当作提交的目标—提交不会包含其他位置
+          (例如 <filename>/path/to/another-dir</filename>) 的文件, 即使它们
+          拥有和命令行相同的变更列表.</para>
       </note>
 
       <para>Even the <command>svn changelist</command> command accepts