[svnbook] r5510 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5510
          http://sourceforge.net/p/svnbook/source/5510
Author:   wuzhouhui
Date:     2017-11-28 12:32:23 +0000 (Tue, 28 Nov 2017)
Log Message:
-----------
1.8/zh: translation of chapter 4 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch04-branching-and-merging.xml

Modified: branches/1.8/zh/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-27 12:17:41 UTC (rev 5509)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-28 12:32:23 UTC (rev 5510)
@@ -6129,6 +6129,7 @@
       总是紧紧追随 APR 的 API 更新. 现在 Subversion 和 APR 都已经进入成熟期,
       所以 Subversion 只使用 APR 经过充分测试的稳定版 API.</para>
 
+      <!--
     <para>Now, if your project depends on someone else's information,
       you could attempt to synchronize that information with your own
       in several ways.  Most painfully, you could issue oral or
@@ -6141,7 +6142,14 @@
       versions of that information to some location in your own
       working copy (see <xref linkend="svn.advanced.externals"
       />).</para>
+      -->
+  <para>如果你的项目依赖其他人的数据, 有若干种方式可以用来同步这些数据. 其中
+    最麻烦的一种是以口头或书面的方式通知项目的所有成员, 将项目所需的第三方数
+    据更新到某个特定版本. 如果第三方数据使用 Subversion 进行管理, 就可以利用
+    Subversion 的外部定义, 快速地将第三方数据更新到特定版本, 并存放在工作
+    副本中 (见 <xref linkend="svn.advanced.externals"/>).</para>
 
+      <!--
     <para>But sometimes you want to maintain custom modifications to
       third-party code in your own version control system.  Returning
       to the software development example, programmers might need to
@@ -6152,15 +6160,28 @@
       changes might never be relayed back to the library maintainers,
       existing solely as custom tweaks to make the library further
       suit the needs of the software developers.</para>
+      -->
+    <para>有时候用户可能需要使用自己的版本控制系统去维护第三方代码的定制化
+      修改. 回到软件开发的例子中, 程序员可以需要修改第三方函数库, 以满足自己
+      的特殊需求. 这些定制化修改可能包括新功能或问题修正, 直到成为第三方函数
+      库的官方修改之前, 它们只在内部维护. 或者这些定制化修改永远不会发送给函数
+      库的官方维护人员, 它们只是为了满足项目的需求而单独存在.</para>
 
+      <!--
     <para>Now you face an interesting situation.  Your project could
       house its custom modifications to the third-party data in some
       disjointed fashion, such as using patch files or full-fledged
+      TODO
       alternative versions of files and directories.  But these quickly
       become maintenance headaches, requiring some mechanism by which
       to apply your custom changes to the third-party code and
       necessitating regeneration of those changes with each successive
       version of the third-party code that you track.</para>
+      -->
+    <para>现在你面临一种非常有趣的情况. 你的项目可以使用几种分离的方式存放
+      第三方数据的定制化修改, 例如使用补丁文件. 但是维护人员很快就会感到头疼,
+      因此迫切需要一种机制, 能够方便地把你的定制化修改应用到第三方代码上, 并
+      且当第三方代码更新时能够迫使开发人员重新生成这些修改.</para>
 
     <para>
       <indexterm>