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

[wuzhouhui at users.sourceforge.net]

Revision: 5532
          http://sourceforge.net/p/svnbook/source/5532
Author:   wuzhouhui
Date:     2017-12-09 03:08:42 +0000 (Sat, 09 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-07 12:06:35 UTC (rev 5531)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-12-09 03:08:42 UTC (rev 5532)
@@ -6952,8 +6952,12 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.branchmerge.when">
+      <!--
     <title>To Branch or Not to Branch?</title>
+      -->
+    <title>分支, 还是不分支?</title>
 
+      <!--
     <para>To branch or not to branch—that is an interesting
       question.  This chapter has provided thus far a pretty deep dive
       into the waters of branching and merging, topics which have
@@ -6967,7 +6971,16 @@
       Rather, the social impact of the decision often carries more
       weight.  Let's examine some of the benefits and costs of using
       branches in a software project.</para>
+      -->
+    <para>分支还是不分支—这是一个有趣的问题. 本章非常深入地介绍了与分支
+      和合并有关的知识, 这两者通常是 Subversion 用户困惑的主要来源. 虽然在分支
+      的创建和管理中, 需要生搬硬套的内容并不复杂, 但是有些用户经常就是否需要创
+      建分支而犹豫不决. 读者已经看到, Subversion 可以处理常见的分支管理场景,
+      所以说决定是否需要为项目创建分支在技术上几乎不会产生什么影响, 它的社会
+      影响反而占据更大的比重. 下面介绍一些在软件项目中使用分支的好处和代价.
+    </para>
 
+      <!--
     <para>The most obvious benefit of working on a branch is
       isolation.  Changes made to the branch don't affect the other
       lines of development in the project; changes made to those other
@@ -6976,6 +6989,12 @@
       fixes, major code rewrites, and so on.  No matter how much stuff
       Sally breaks on her branch, Harry and the rest of the team can
       continue with their work unhindered outside the branch.</para>
+      -->
+    <para>使用分支最明显的好处是隔离性. 提交到分支上的修改不会影其他的开发线,
+      提交到其他开发线的修改也不会影响分支. 利用这点, 开发人员就能安全地在分支
+      上开发新特性, 对复杂的问题进行修正, 对代码进行重写等. 无论 Sally 在自己
+      的分支上怎么折腾, Harry 和团队的其他人都可以不受阻碍地继承他们的工作.
+    </para>
 
     <para>Branches also provide a great way to organize related
       changes into readily identifiable collections.  For example, the