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

[wuzhouhui at users.sourceforge.net]

Revision: 5511
          http://sourceforge.net/p/svnbook/source/5511
Author:   wuzhouhui
Date:     2017-11-29 12:39:04 +0000 (Wed, 29 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-28 12:32:23 UTC (rev 5510)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-29 12:39:04 UTC (rev 5511)
@@ -6186,14 +6186,24 @@
     <para>
       <indexterm>
         <primary>vendor drop</primary>
-      </indexterm>The solution to this problem is to
+      </indexterm>
+      解决办法是使用 <firstterm>供方分支</firstterm> (<firstterm>vendor
+        branches</firstterm>). 供方分支是一个存在于你自己的版本控制系统中的
+      目录, 包含了由第三方提供的数据. 被项目吸收的每一个供方数据版本都称为
+      一个 <firstterm>供方物资</firstterm> (<firstterm>vendor
+        drop</firstterm>).</para>
+      <!--
+      The solution to this problem is to
       use <firstterm>vendor branches</firstterm>.  A vendor branch is
       a directory tree in your own version control system that
       contains information provided by a third-party entity, or
       vendor.  Each version of the vendor's data that you decide to
+      TODO
       absorb into your project is called a <firstterm>vendor
       drop</firstterm>.</para>
+      -->
 
+      <!--
     <para>Vendor branches provide two benefits.  First, by storing the
       currently supported vendor drop in your own version control
       system, you ensure that the members of your project never need
@@ -6204,15 +6214,29 @@
       changes to it in-place—you have no more need of an
       automated (or worse, manual) method for swapping in your
       customizations.</para>
+      -->
+    <para>供方分支有两个好处. 首先, 通过在自己的版本控制系统中存放当前支持
+      的供方物资, 你就可以确认项目成员不必再担心他们是否使用了供方数据的正确
+      版本, 只需要更新工作副本, 他们就可以得到供方数据的正确版本. 第二, 因为
+      供方数据使用 Subversion 进行管理, 所以用户可以方便地在仓库中存放自己的
+      定制化修改, 而无需再使用某种自动的 (或手动的) 方法对定制化修改进行换
+      入换出.</para>
 
+      <!--
     <para>Unfortunately, there is no single best way to manage vendor
       branches in Subversion.  The flexibility of the system offers
       several different approaches, each of which has its advantages
       and disadvantages, and none of which can be clearly considered
+      TODO
       a <quote>silver bullet</quote> for the problem.  We'll cover a
       few of these approaches at a high level in the following
       sections, using the common example of a software project which
       depends on a third-party library.</para>
+      -->
+    <para>不幸的是, 在 Subversion 中并不存在一种管理供方分支的最佳方法. 系统
+      的灵活性提供了多种不同的管理方法, 每一种都有各自的优缺点. 在下面几节里,
+      我们将从较高的层面介绍其中几种方法, 所使用的例子也是依赖第三方函数库的
+      典型示例.</para>
 
     <!-- =============================================================== -->
     <sect2 id="svn.advanced.vendorbr.general">