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

[wuzhouhui at users.sourceforge.net]

Revision: 5491
          http://sourceforge.net/p/svnbook/source/5491
Author:   wuzhouhui
Date:     2017-11-13 14:14:42 +0000 (Mon, 13 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-12 05:48:50 UTC (rev 5490)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-13 14:14:42 UTC (rev 5491)
@@ -4675,7 +4675,7 @@
       <!--
       <title>Blocking Merge Tracking Unaware Clients</title>
       -->
-      <title>为旧客户端禁止合并跟踪</title>
+      <title>禁止不支持合并跟踪的客户端</title>
 
       <!--
       <para>If you've just upgraded your server to Subversion 1.5 or
@@ -4767,13 +4767,22 @@
     </sect2>
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.advanced.finalword">
+      <!--
       <title>The Final Word on Merge Tracking</title>
+      -->
+      <title>关于合并跟踪的最后一点内容</title>
 
+      <!--
       <para>The bottom line is that Subversion's merge-tracking
         feature has an complex internal implementation, and
         the <literal>svn:mergeinfo</literal> property is the only
         window the user has into the machinery.</para>
+      -->
+      <para>最后要说的是 Subversion 的合并跟踪特性有一个复杂的内容实现, 而
+        属性 <literal>svn:mergeinfo</literal> 是用户了解合并跟踪内部机制的
+        唯一窗口.</para>
 
+      <!--
       <para>How and when mergeinfo is recorded by a merge can sometimes
         be difficult to understand.  Furthermore, the management of
         mergeinfo metadata has a whole set of taxonomies and behaviors
@@ -4783,7 +4792,14 @@
         mechanisms of mergeinfo <quote>elision,</quote> and
         even <quote>inheritance</quote> from parent to child
         directories.</para>
+      -->
+      <para>记录合并信息的时机和方式有时候会很难理解, 另外, 合并信息元数据的
+        管理也分成了很多种类型, 例如 <quote>显式</quote> 与 <quote>隐式</quote>
+        的合并信息, <quote>可实施</quote> 与 <quote>不可实施</quote> 的版本号,
+        <quote>省略</quote> 合并信息的特定机制, 以及从父目录到子目录的 <quote>
+          继承</quote>.</para>
 
+      <!--
       <para>We've chosen to only briefly cover, if at all, these detailed
         topics for a couple of reasons.  First, the level of detail is
         overwhelming for a typical user.  Second, and more
@@ -4794,30 +4810,56 @@
         paper posted at CollabNet's website: <ulink
         url="http://www.open.collab.net/community/subversion/articles/merge-info.html"
         />.</para>
+      -->
+    <para>我们决定只对这些主题进行简单的介绍, 原因有以下几点. 首先对于一个普
+      通用户来说, 细节过于复杂; 第二, 普通用户 <emphasis>不需要</emphasis>
+      完全理解这些概念, 实现上的细节对他们而言是透明的. 如果读者有兴趣, 可以
+      阅读 CollabNet 的一篇文章: <ulink
+        url="http://www.open.collab.net/community/subversion/articles/merge-info.html"
+        />.</para>
 
+      <!--
       <para>For now, if you want to steer clear of the complexities of
         merge tracking, we recommend that you follow these simple best
         practices:</para>
+      -->
+      <para>如果读者只想尽量避开合并跟踪的复杂性, 我们有以下建议:</para>
 
       <itemizedlist>
         <listitem>
+      <!--
           <para>For short-term feature branches, follow the simple
             procedure described throughout
             <xref linkend="svn.branchmerge.basicmerging"/>.</para>
+      -->
+          <para>如果是短期的特性分支, 遵循
+            <xref linkend="svn.branchmerge.basicmerging"/> 描述的步骤.</para>
         </listitem>
         <listitem>
+      <!--
           <para>Avoid subtree merges and subtree mergeinfo. Perform
             merges only on the root of your branches, not on
             subdirectories or files (see <xref
             linkend="svn.branchmerge.basicmerging.stayinsync.subtree"/>)
             .</para>
+      -->
+          <para>避免子目录合并与子目录合并信息, 只在分支的根目录执行合并,
+            而不是在分支的子目录或文件上执行合并 (见 <xref
+              linkend="svn.branchmerge.basicmerging.stayinsync.subtree"/>).
+          </para>
         </listitem>
         <listitem>
+      <!--
           <para>Don't ever edit the <literal>svn:mergeinfo</literal>
             property directly; use <command>svn
-            merge</command> with the <option>--record-only</option> option
+            merge</command> with the <option>- -record-only</option> option
             to effect a desired change to the metadata (as demonstrated in
             <xref linkend="svn.branchmerge.advanced.blockchanges"/>).</para>
+      -->
+          <para>不要直接修改属性 <literal>svn:mergeinfo</literal>, 而是用
+            带有选项 <option>--record-only</option> 的命令 <command>svn merge
+            </command> 向属性施加期望的修改, 见
+            <xref linkend="svn.branchmerge.advanced.blockchanges"/>).</para>
         </listitem>
         <listitem>
           <para>Your merge target should be a working copy which