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

[wuzhouhui at users.sourceforge.net]

Revision: 5519
          http://sourceforge.net/p/svnbook/source/5519
Author:   wuzhouhui
Date:     2017-12-05 12:31:42 +0000 (Tue, 05 Dec 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-12-05 03:04:24 UTC (rev 5518)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-12-05 12:31:42 UTC (rev 5519)
@@ -6666,10 +6666,14 @@
         工作, 但其中的关键问题是确保每一个供方物资都能得到相同的对待.</para>
   </footnote></para>
        
+      <!--
       <para>Now that the first vendor release drop is present in our
         repository, we can create our vendor branch from it just as we
         would create any other branch—using <command>svn
         copy</command>.</para>
+      -->
+    <para>供方发布物资进入我们的仓库后, 接下来就可以用
+      <command>svn copy</command> 创建供方分支.</para>
 
       <informalexample>
         <screen>
@@ -6681,6 +6685,7 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Okay.  At this point we have a vendor branch based on
         libcomplex 1.0.0.  We are now poised to begin making the
         customizations to libcomplex required for our
@@ -6687,7 +6692,13 @@
         purposes—committing them directly to the vendor branch
         we've created—and then to start using our customized
         libcomplex in our own application.</para>
+      -->
+      <para>现在, 我们拥有了基于 libcomplex 1.0.0 的供方分支, 接下来就可以按照
+        项目的需要, 对 libcomplex 进行定制化修改—修改完成后直接提交到
+        刚创建的供方分支里—然后再在自己的项目中使用定制过的 libcomplex.
+      </para>
 
+      <!--
       <para>Some time later, libcomplex 1.0.1 is released.  After
         reviewing its changes, we decide we'd like to upgrade our
         vendor branch to the new version.  In order to perform that
@@ -6700,7 +6711,15 @@
         repository</emphasis>.  Afterwards, we'll use the 2-URL form
         of the <command>svn merge</command> command to replicate those
         same changes into our vendor branch.</para>
+      -->
+      <para>一段时间后, 发布了 libcomplex 1.0.1. 通过查看修改日志, 我们打算
+        把供方分支升级到新版. 为了升级供方分支, 我们需要把 1.0.0 和 1.0.1
+        之间的差异应用到供方分支中, 而且不能影响定制化修改. 完成这项操作最
+        案例的方式是先把 libcomplex 1.0.1 <emphasis>作为 libcomplex 1.0.0
+          的增量版本</emphasis> 导入到我们的仓库中, 然后使用 2-URL 形式的
+        <command>svn merge</command>, 把差异应用到供方分支中.</para>
 
+      <!--
       <para>As it turns out, there are several different approaches we
         can take to to get libcomplex 1.0.1 into our repository in the
         right way.<footnote><para>Using another <command>svn
@@ -6710,6 +6729,12 @@
         ancestry.</para></footnote>  The approach we'll describe here
         is relatively rudimentary, but it will serve our illustrative
         needs.</para>
+      -->
+      <para>事实证明, 有多种方式都可以正确地把 libcomplex 1.0.1 添加到仓库中.
+        <footnote><para>不正确的做法是再使用一次 <command>svn import</command>,
+            因为这将导致 libcomplex 1.0.0 和 libcomplex 1.0.1 不含有共同的祖
+            先.</para></footnote> 我们在这里介绍的方法相对比较原始, 但作为说明
+        已经足够了.</para>
 
       <para>Remember, we want our mirror of the libcomplex 1.0.1
         vendor drop to share ancestry with our 1.0.0 vendor drop,