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

[wuzhouhui at users.sourceforge.net]

Revision: 5397
          http://sourceforge.net/p/svnbook/source/5397
Author:   wuzhouhui
Date:     2017-08-15 13:10:56 +0000 (Tue, 15 Aug 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-08-14 14:43:45 UTC (rev 5396)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-15 13:10:56 UTC (rev 5397)
@@ -5726,23 +5726,37 @@
       无法容纳 (可能这就是用户不想把它检出到工作副本里的原因).</para>
 
     <note>
+    <!--
       <para>While the functionality for excluding an existing item
         from a working copy was hung off of the <command>svn
         update</command> command, you might have noticed that the
-        output from <userinput>svn update --set-depth
+        output from <userinput>svn update - -set-depth
         exclude</userinput> differs from that of a normal update
         operation.  This output betrays the fact that, under the hood,
         exclusion is a completely client-side operation, very much
         unlike a typical update.</para>
+    -->
+      <para>虽然这个功能—从工作副本中排除已有的项目—由 <command>
+          svn update</command> 完成, 但读者可能已经注意到 <userinput>
+          svn update --set-depth exclude</userinput> 的输出和通常的
+        <command>svn update</command> 的不太一样. 排除是一个完全客户端的操作,
+        但命令的输出却不太符合这个事实.</para>
     </note>
 
+    <!--
     <para>In such a situation, you might consider a compromise
       approach.  First, check out the top-level directory
-      with <option>--depth immediates</option>.  Then, exclude the
-      directory you don't want using <userinput>svn update --set-depth
+      with <option>- -depth immediates</option>.  Then, exclude the
+      directory you don't want using <userinput>svn update - -set-depth
       exclude</userinput>.  Finally, telescope all the items that
       remain to infinite depth, which should be fairly easy to do
       because they are all addressable in your shell.</para>
+    -->
+    <para>如果出现这种情况, 你可能需要一个折衷的方法. 首先, 使用 <literal>
+        --depth immediates</literal> 检出顶层目录, 然后用 <literal>
+        svn update --set-depth exclude</literal> 排除不感兴趣的子目录, 最后,
+      把剩下的子目录的深度设置成 <literal>infinity</literal>, 因为子目录都已
+      经出现在本地了, 所以应该会容易一点.</para>
 
     <informalexample>
     <screen>
@@ -5756,6 +5770,7 @@
 </screen>
     </informalexample>
 
+    <!--
     <para>Once again, your working copy will have the same stuff as in
       the previous two scenarios.  But now, any time a new file or
       subdirectory is committed to the top-level directory, you'll
@@ -5763,6 +5778,11 @@
       working copy.  You can now decide what to do with such newly
       appearing working copy items: expand them into infinite depth,
       or exclude them altogether.</para>
+    -->
+    <para>再说一次, 这种方法得到的工作副本里的数据和前两种方法完全相同, 当有
+      新的文件或目录提交到顶层目录时, 更新操作按深度 <literal>empty</literal>
+      把文件或目录更新到本地, 接下来你可以决定针对新出现的项目应该采取什么
+      操作: 是把深度扩展到 <literal>infinity</literal>, 还是把它排除.</para>
 
   </sect1>