[svnbook] r5398 committed - branches/1.8/zh/book/ch03-advanced-topics.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5398
          http://sourceforge.net/p/svnbook/source/5398
Author:   wuzhouhui
Date:     2017-08-16 14:50:40 +0000 (Wed, 16 Aug 2017)
Log Message:
-----------
1.8/zh: translation of chapter 3 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch03-advanced-topics.xml

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-15 13:10:56 UTC (rev 5397)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-16 14:50:40 UTC (rev 5398)
@@ -5790,8 +5790,12 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.advanced.locking">
+    <!--
     <title>Locking</title>
+    -->
+    <title>锁</title>
 
+    <!--
     <para>Subversion's copy-modify-merge version control model lives
       and dies on its data merging algorithms—specifically on
       how well those algorithms perform when trying to resolve
@@ -5811,6 +5815,18 @@
       when you can't find a tool that can handle that type of merging,
       you begin to run into problems with the copy-modify-merge
       model.</para>
+    -->
+    <para>Subversion 的数据合并算法与 复制-修改-合并 模型之间的关系就像水和
+      船: 水能载舟, 亦能覆舟—尤其是当 Subversion 尝试解决冲突时, 合并
+      算法的表现至关重要. Subversion 自身只提供了一种合并算法: 三路差异比较算
+      法的智能足够在行的级别上处理数据. 作为补充, Subversion 允许用户指定外部
+      的差异比较工具 (在 
+      <xref linkend="svn.advanced.externaldifftools.diff3" /> 和
+      <xref linkend="svn.advanced.externaldifftools.merge" /> 介绍), 这些外
+      部工具可能比 Subversion 工作得更好, 比如在单词或字符的级别上比较差异.
+      但是这些工具和 Subversion 的算法通常只能处理文本文件, 在面对非文本文件
+      时, 现实就残酷多了. 如果用户无法找到支持非文本文件合并的工具,
+      复制-修改-合并 模型就不再适用.</para>
 
     <para>Let's look at a real-life example of where this model runs
       aground.  Harry and Sally are both graphic designers working on