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

[wuzhouhui at users.sourceforge.net]

Revision: 5504
          http://sourceforge.net/p/svnbook/source/5504
Author:   wuzhouhui
Date:     2017-11-21 12:43:08 +0000 (Tue, 21 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-20 12:46:37 UTC (rev 5503)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-21 12:43:08 UTC (rev 5504)
@@ -5578,6 +5578,7 @@
         另一种布局只是服务器端的一系列移动而已, 如果你不喜欢当前的仓库布局,
         要以任意修改目录结构.</para>
 
+      <!--
       <para>Remember, though, that while moving directories is
         easy to do, you need to be considerate of other users as well.
         Your juggling can disorient users with existing
@@ -5588,13 +5589,24 @@
         told that her working copy represents a path that no
         longer exists.  She is then forced to <command>svn
         switch</command> to the new location.</para>
+      -->
+    <para>记住, 虽然移动目录很容易操作, 但你仍然需要考虑其他用户. 把目录调
+      来调去可能会让其他用户感到迷惑, 如果有个用户的工作副本所对应的仓库目录
+      被其他用户用 <command>svn move</command> 移动其他地方去了, 那么用户下
+      次执行 <command>svn update</command> 时, 就会被告知工作副本对对应的仓库
+      目录已经不存在了, 他必须用 <command>svn switch</command> 把工作副本切换
+      到仓库中的另一个位置.</para>
 
     </sect2>
 
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.maint.lifetime">
+      <!--
       <title>Data Lifetimes</title>
+      -->
+      <title>数据的生命周期</title>
 
+      <!--
       <para>Another nice feature of Subversion's model is that
         branches and tags can have finite lifetimes, just like any
         other versioned item.  For example, suppose you eventually
@@ -5603,6 +5615,11 @@
         changes back into <filename>/calc/trunk</filename>, there's
         no need for your private branch directory to stick around
         anymore:</para>
+      -->
+      <para>Subversion 模型具有的另一个优良特性是分支和标签的生命周期是有限的,
+        就像一个普通的被版本控制的条目. 比如说用户在自己的分支中最终完成了工
+        作, 当分支上所有的修改都被合并到 <filename>/calc/trunk</filename> 后,
+        就没必须再在仓库中保留自己的分支了.</para>
 
       <informalexample>
         <screen>
@@ -5614,9 +5631,13 @@
       </informalexample>
 
       <tip>
+      <!--
         <para>Recall from the previous section that if the repository
           location your working copy refers to is deleted, then when
           you try to update you will receive an error:</para>
+      -->
+        <para>上一小节刚刚讲过, 如果工作副本所对应的仓库路径已经被删除了, 此时
+          再更新工作副本将会收到错误:</para>
         <informalexample>
           <screen>
 $ svn up
@@ -5625,8 +5646,12 @@
 </screen>
         </informalexample>
 
+      <!--
         <para>All you need to do in this situation is switch your working
           copy to a location that still exits:</para>
+      -->
+        <para>对于这种情况, 你所需要做的就是把工作副本切换到仓库中仍然存在的
+          其他路径:</para>
 
         <informalexample>
           <screen>
@@ -5640,6 +5665,7 @@
         </informalexample>
       </tip>
 
+      <!--
       <para>And now your branch is gone.  Of course, it's not really
         gone: the directory is simply missing from the
         <literal>HEAD</literal> revision, no longer distracting
@@ -5647,7 +5673,13 @@
         <command>svn switch</command>, or <command>svn list</command>
         to examine an earlier revision, you can still see
         your old branch.</para>
+      -->
+      <para>现在你的分支就消失了, 当然并非永远地消失: 分支只是在 <literal>HEAD
+        </literal> 上看不到了. 如果用 <command>svn checkout</command>,
+        <command>svn switch</command> 或 <command>svn list</command> 查看较
+        早的版本号, 你仍然可以看到你的旧分支.</para>
 
+      <!--
       <para>If browsing your deleted directory isn't enough, you can
         always bring it back.  Resurrecting data is very easy in
         Subversion.  If there's a deleted directory (or file) that
@@ -5654,6 +5686,11 @@
         you'd like to bring back into <literal>HEAD</literal>, simply
         use <command>svn copy</command> to copy it from the old
         revision:</para>
+      -->
+      <para>如果浏览已删除的目录还不够, 你还可能把它们再恢复回来. 在 Subversion
+        中恢复数据非常容易, 如果用户想把一个已删除的目录或文件恢复到 <literal>
+          HEAD</literal> 中, 只需要用 <command>svn copy</command> 把它从旧
+        版中复制出来即可:</para>
 
       <informalexample>
         <screen>