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

[wuzhouhui at users.sourceforge.net]

Revision: 5396
          http://sourceforge.net/p/svnbook/source/5396
Author:   wuzhouhui
Date:     2017-08-14 14:43:45 +0000 (Mon, 14 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-13 02:32:35 UTC (rev 5395)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-14 14:43:45 UTC (rev 5396)
@@ -5676,6 +5676,8 @@
 </screen>
     </informalexample>
 
+    <!--
+    TODO
     <para>This could be quite tedious, especially since you don't even
       have stubs of these directories in your working copy to deal
       with.  Such a working copy would also have another
@@ -5683,11 +5685,19 @@
       else creates any new subdirectories in this top-level directory,
       you won't receive those when you update your working
       copy.</para>
+    -->
+    <para>这可能会非常枯燥, 另一个问题是如果有人提交了一个新的子目录, 当
+      你更新工作副本时将看不到这个新的子目录, 这应该不是你想要的效果.</para>
 
+    <!--
     <para>Beginning with Subversion 1.6, you can take a different
       approach.  First, check out the directory in full.  Then
-      run <userinput>svn update --set-depth exclude</userinput> on the
+      run <userinput>svn update - -set-depth exclude</userinput> on the
       one subdirectory you don't care about.</para>
+    -->
+    <para>从 Subversion 1.6 开始, 你有了另一种选择. 首先检出一个完整的目录,
+      然后在不兴趣的目录上执行 <userinput>svn update --set-depth exclude
+    </userinput></para>
 
     <informalexample>
       <screen>
@@ -5699,6 +5709,7 @@
 </screen>
     </informalexample>
 
+    <!--
     <para>This approach leaves your working copy with the same stuff
       as in the first approach, but any new subdirectories which
       appear in the top-level directory would also show up when you
@@ -5708,6 +5719,11 @@
       want it.  This might not even be possible if that subdirectory
       is too large to fit on your disk (which might, after all, be the
       very reason you don't want it in your working copy).</para>
+    -->
+    <para>和第一种方法相比, 使用第二种方法后在工作副本里留下的数据是相同的,
+      但是如果有新的子目录被提交到仓库中, 更新工作副本时仍然可以看到. 第二种
+      方法的缺点是一开始要检出后来不用的子目录, 如果子目录过于庞大, 大到磁盘
+      无法容纳 (可能这就是用户不想把它检出到工作副本里的原因).</para>
 
     <note>
       <para>While the functionality for excluding an existing item