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

[wuzhouhui at users.sourceforge.net]

Revision: 5508
          http://sourceforge.net/p/svnbook/source/5508
Author:   wuzhouhui
Date:     2017-11-26 12:13:19 +0000 (Sun, 26 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-25 12:06:28 UTC (rev 5507)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-26 12:13:19 UTC (rev 5508)
@@ -6023,6 +6023,7 @@
       <para>解决问题最好的办法是定期从主干自动合并到分支, 可以定一个标准,
         比如一周合并一次.</para>
 
+      <!--
       <para>When you are eventually ready to merge the
         <quote>synchronized</quote> feature branch back to the trunk,
         begin by doing a final automatic merge of the latest trunk
@@ -6030,6 +6031,10 @@
         of branch and trunk are absolutely identical except for
         your branch changes.  You can then run an automatic reintegrate
         merge from the branch back to the trunk:</para>
+      -->
+      <para>当用户终于准备好把 <quote>同步的</quote> 特性分支合并到主干上时,
+        最后再为特性分支做一次自动同步合并, 合并后分支和主干就是一样的了 (除
+        了分支特有的修改). 然后再执行自动再整合合并, 把分支合并到主干上.</para>
 
       <informalexample>
         <screen>
@@ -6050,6 +6055,7 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Another way of thinking about this pattern is that your
         weekly sync of trunk to branch is analogous to running
         <command>svn update</command> in a working copy, while the
@@ -6058,6 +6064,11 @@
         <emphasis>is</emphasis> a working copy but a very shallow
         private branch?  It's a branch that's capable of
         storing only one change at a time.</para>
+      -->
+      <para>这种分支模式的另一种理解方式是: 每周从主干向分支的同步就像在工作
+        副本中执行 <command>svn update</command>, 最后从分支到主干的合并就像
+        在工作副本中执行 <command>svn commit</command>. 毕竟, 工作副本就像是
+        一个非常浅的私有分支, 一次只能保存一个修改.</para>
 
     </sect2>
 
@@ -6067,7 +6078,10 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.advanced.vendorbr">
+      <!--
     <title>Vendor Branches</title>
+      -->
+    <title>供方分支</title>
 
     <para>
       <indexterm>