[svnbook] r5310 committed - branches/1.8/zh/book/ ch01-fundamental-concepts.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5310
          http://sourceforge.net/p/svnbook/source/5310
Author:   wuzhouhui
Date:     2017-06-04 07:23:49 +0000 (Sun, 04 Jun 2017)
Log Message:
-----------
Branch 1.8/zh: section "Version Control Basics" of chapter 1 done,
translation of chapter 1 in progress.

Modified Paths:
--------------
    branches/1.8/zh/book/ch01-fundamental-concepts.xml

Modified: branches/1.8/zh/book/ch01-fundamental-concepts.xml
===================================================================
--- branches/1.8/zh/book/ch01-fundamental-concepts.xml	2017-06-04 04:34:05 UTC (rev 5309)
+++ branches/1.8/zh/book/ch01-fundamental-concepts.xml	2017-06-04 07:23:49 UTC (rev 5310)
@@ -556,6 +556,7 @@
           同一文件时, 经验表明他们的大多数修改不会重叠, 冲突情况其实很少发
           生. 解决冲突花费的时间通常要比使用锁机制浪费的时间要少得多.</para>
 
+    <!--
         <para>In the end, it all comes down to one critical factor:
           user communication.  When users communicate poorly, both
           syntactic and semantic conflicts increase.  No system can
@@ -564,14 +565,27 @@
           lulled into a false sense of security that a locking system
           will somehow prevent conflicts; in practice, locking seems
           to inhibit productivity more than anything else.</para>
+    -->
+        <para>上面所说的问题都涉及到一个关键因素: 用户间的沟通. 如果用户间
+          缺乏沟通, 发生语法冲突和语义冲突的概率都会增加. 没有一个版本控制
+          系统可以强制用户沟通或检测语义冲突, 所以不要认为使用锁机制可以完
+          全避免产生冲突, 在实际使用中, 锁机制似乎会影响工作效率.</para>
 
         <sidebar id="svn.basic.vsn-models.copy-merge.sb-1">
+    <!--
           <title>When Locking Is Necessary</title>
+    -->
+          <title>什么时候使用锁是必须的</title>
 
+    <!--
           <para>While the lock-modify-unlock model is considered
             generally harmful to collaboration, sometimes
             locking is appropriate.</para>
+    -->
+          <para>虽然人们通常认为 加锁-修改-解锁 模型对协作开发是有害的,
+            但某些情况下却是最合适的.</para>
 
+    <!--
           <para>The copy-modify-merge model is based on the assumption
             that files are contextually mergeable—that is, that the
             majority of the files in the repository are line-based text
@@ -582,11 +596,23 @@
             turns when changing the file.  Without serialized access,
             somebody ends up wasting time on changes that are ultimately
             discarded.</para>
+    -->
+          <para>复制-修改-合并 模型要求文件是支持合并的—也就是说文件
+            是基于行的文本文件 (例如程序源代码文件), 但是对二进制文件 (例如
+            图片和音频文件) 来说, 合并有冲突的修改几乎是不可能完成的. 在这
+            种情况下, 串行地修改文件就显得非常有必要. 如果没有串行访问,
+            用户花费大量时间作出的修改很可能会被丢弃.</para>
 
+    <!--
           <para>While Subversion is primarily a copy-modify-merge
             system, it still recognizes the need to lock an occasional
             file, and thus provides mechanisms for this.  We discuss
             this feature in <xref linkend="svn.advanced.locking"/>.</para>
+    -->
+          <para>Subversion 以 复制-修改-合并 模型为主, 但是对某些类型的文件
+            仍然需要使用 加锁-修改-解锁 模型, 我们将在
+            <xref linkend="svn.advanced.locking"/> 介绍如何在 Subversion 
+            中使用 加锁-修改-解锁 模型.</para>
 
         </sidebar>