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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Wed Dec 6 05:58:49 CST 2017


Revision: 5527
          http://sourceforge.net/p/svnbook/source/5527
Author:   wuzhouhui
Date:     2017-12-06 11:58:49 +0000 (Wed, 06 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-06 08:06:33 UTC (rev 5526)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-12-06 11:58:49 UTC (rev 5527)
@@ -6736,6 +6736,7 @@
             先.</para></footnote> 我们在这里介绍的方法相对比较原始, 但作为说明
         已经足够了.</para>
 
+      <!--
       <para>Remember, we want our mirror of the libcomplex 1.0.1
         vendor drop to share ancestry with our 1.0.0 vendor drop,
         which will produce the best results later when we need to
@@ -6744,6 +6745,11 @@
         of our previously created libcomplex-1.0.0 <quote>vendor
         tag</quote>—a copy which will eventually become a
         replica of libcomplex 1.0.1.</para>
+      -->
+      <para>记住, 我们希望 libcomplex 1.0.1 在我们这儿的镜像能和 1.0.0 的镜像
+        共享祖先, 这样的话在把它们之间的差异合并到供方分支时, 能产生最好的效果.
+        于是, 首先通过复制 <quote>供方标签</quote> libcomplex-1.0.0 创建分支
+        libcomplex-1.0.1—它最终将变成 libcomplex-1.0.1 的副本.</para>
         
       <informalexample>
         <screen>
@@ -6755,15 +6761,22 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>What we need now is to make a working copy of our
         libcomplex-1.0.1 branch, and then to make it actually look
         like libcomplex 1.0.1.  To do this, we'll take advantage of
         the fact that <command>svn checkout</command> can overlay an
-        existing directory and, if the <option>--force</option> option
+        existing directory and, if the <option>- -force</option> option
         is provided, do so in manner that allows the differences
         between the checked-out tree and the target tree that the
         checkout overlayed to remain as local modifications in the new
         working copy.</para>
+      -->
+      <para>现在我们需要检出分支 libcomplex-1.0.1 的工作副本, 然后把工作副本
+        中的代码升级到 1.0.1. 为了完成这些操作, 我们将利用这样一个事实, 就是
+        <command>svn checkout</command> 可以覆盖已存在的目录, 并且如果提供了
+        选项 <option>--force</option>, 那么检出的目录和被覆盖的目标目录之间
+        的差异将作为本地修改, 留在工作副本中.</para>
 
       <informalexample>
         <screen>
@@ -6794,11 +6807,16 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>As you can see, after checking out what was really
         libcomplex 1.0.0 atop the libcomplex 1.0.1 exploded tarball,
         we are left with a working copy that contains local
         modifications—those modifications required to morph our
         previous vendor release drop into our new one.</para>
+      -->
+      <para>可以看到, 在 libcomplex 1.0.1 的目录中检出 libcomplex 1.0.0 的
+        代码, 将得到一个包含了本地修改的工作副本—正是这些修改, 把
+        libcomplex 1.0.0 升级到 libcomplex 1.0.1.</para>
 
       <para>Admittedly, this is a pretty simple example.  The changes
         required to perform this particular upgrade involved merely




More information about the svnbook-dev mailing list