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

[wuzhouhui at users.sourceforge.net]

Revision: 5473
          http://sourceforge.net/p/svnbook/source/5473
Author:   wuzhouhui
Date:     2017-10-27 15:00:37 +0000 (Fri, 27 Oct 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-10-26 20:06:10 UTC (rev 5472)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-10-27 15:00:37 UTC (rev 5473)
@@ -2896,13 +2896,24 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.cherrypicking">
+      <!--
       <title>Cherrypicking</title>
+      -->
+      <title>精选</title>
 
       <para>
         <indexterm>
           <primary>merging</primary>
           <secondary>cherrypicking</secondary>
-        </indexterm>Just as the term <quote>changeset</quote> is often used in
+        </indexterm>
+        和术语 <quote>变更集</quote> 一样, 术语 <firstterm>精选</firstterm>
+        (<firstterm>cherrypicking</firstterm>) 也经常出现在版本控制系统中.
+        精选指的是这样一种操作: 从分支中挑选 <emphasis>一个</emphasis> 的变更
+        集, 将其复制到其他地方. 精选也可以指这样一种操作: 将一个特定的变更集
+        集合 (不一定是连续的) 从一个分支复制到另一个分支上. 这和典型的合并
+        场景相反 (典型的合并场景是自动合并下一段版本号范围).</para>
+      <!--
+        Just as the term <quote>changeset</quote> is often used in
         version control systems, so is the term
         <firstterm>cherrypicking</firstterm>.  This word refers to
         the act of choosing <emphasis>one</emphasis> specific
@@ -2913,12 +2924,18 @@
         typical merging scenarios, where the <quote>next</quote>
         contiguous range of revisions is duplicated
         automatically.</para>
+      -->
 
+      <!--
       <para>Why would people want to replicate just a single change?
         It comes up more often than you'd think.  For example, let's
         assume you've created a new feature branch <filename>
         /calc/branches/my-calc-feature-branch</filename> copied from
         <filename>/calc/trunk</filename>:</para>
+      -->
+      <para>为什么会有人只想复制单独的一个修改? 这种情况要比你想像的更常发生,
+        假设你从 <filename>/calc/trunk</filename> 创建了一个特性分支
+        <filename>/calc/branches/my-calc-feature-branch</filename>:</para>
 
       <informalexample>
         <screen>
@@ -2933,6 +2950,7 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>At the water cooler, you get word that Sally made an interesting
         change to <filename>main.c</filename> on the trunk.
         Looking over the history of commits to the trunk, you see that
@@ -2941,6 +2959,12 @@
         to merge all the trunk changes to your branch just yet, but
         you certainly need that particular bug fix in order to continue
         your work.</para>
+      -->
+      <para>在饮水机接水时, 你听说 Sally 向主干上的 <filename>main.c</filename>
+        提交了一个很有意思的修改, 通过查看主干的提交历史, 你发现在版本号 413,
+        Sally 修正了一个很严重的错误, 而这个错误也会影响你正在开发的新特性.
+        你的分支可能还没有准备好合并主干上的所有修改, 但是为了能让工作继续
+        下去, 你确实需要 r413 的修改.</para>
 
       <informalexample>
         <screen>
@@ -2966,9 +2990,13 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Just as you used <command>svn diff</command> in the prior
         example to examine revision 413, you can pass the same option
         to <command>svn merge</command>:</para>
+      -->
+      <para>就像上面例子中的 <command>svn diff</command> 查看 r413 那样,
+        你也可以向 <command>svn merge</command> 传递相同的选项:</para>
 
       <informalexample>
         <screen>