[svnbook] r5900 committed - branches/1.8/zh/book/ref-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5900
          http://sourceforge.net/p/svnbook/source/5900
Author:   wuzhouhui
Date:     2019-03-15 12:40:39 +0000 (Fri, 15 Mar 2019)
Log Message:
-----------
1.8/zh: translation of svn reference in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ref-svn.xml

Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml	2019-03-12 17:00:56 UTC (rev 5899)
+++ branches/1.8/zh/book/ref-svn.xml	2019-03-15 12:40:39 UTC (rev 5900)
@@ -2457,8 +2457,11 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Check out two different directories into two separate
         working copies:</para>
+      -->
+      <para>把两个不同的目录检出到两个工作副本中:</para>
 
       <informalexample>
         <screen>
@@ -2478,9 +2481,13 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Check out two different directories into two separate
         working copies, but place both into a directory called
         <filename>working-copies</filename>:</para>
+      -->
+      <para>把两个不同的目录检出到两个工作副本中, 不过这两个工作副本都在
+        <filename>working-copies</filename> 目录里:</para>
 
       <informalexample>
         <screen>
@@ -2500,11 +2507,16 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>If you interrupt a checkout (or something else
         interrupts your checkout, such as loss of connectivity,
         etc.), you can restart it either by issuing the identical
         checkout command again or by updating the incomplete
         working copy:</para>
+      -->
+      <para>如果检出被中断 (例如被用户主动中断, 或者网络连接断开), 为了从
+        中断的地方继续往下执行, 你可以再次执行相同的检出命令, 或者在不完整的
+        工作副本里执行更新命令:</para>
 
       <informalexample>
         <screen>
@@ -2525,10 +2537,15 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>If you wish to check out some revision other than the
         most recent one, you can do so by providing the
-        <option>--revision</option> (<option>-r</option>) option
+        <option>- -revision</option> (<option>-r</option>) option
         to the <command>svn checkout</command> command:</para>
+      -->
+      <para>如果你希望检出特定版本号的工作副本, 就为命令 <command>svn
+          checkout</command> 加上选项 <option>--revision</option>
+        (<option>-r</option>):</para>
 
       <informalexample>
         <screen>
@@ -2539,6 +2556,7 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Prior to version 1.7, Subversion would complain by
         default if you try to check out a directory atop an
         existing directory which contains files or subdirectories
@@ -2545,9 +2563,9 @@
         that the checkout itself would have created.  Subversion
         1.7 handles this situation differently, allowing the
         checkout to proceed but marking any obstructing objects as
-        tree conflicts.  Use the <option>--force</option> option
+        tree conflicts.  Use the <option>- -force</option> option
         to override this safeguard.  When you check out with
-        the <option>--force</option> option, any unversioned file
+        the <option>- -force</option> option, any unversioned file
         in the checkout target tree which ordinarily would
         obstruct the checkout will still become versioned, but
         Subversion will preserve its contents as-is.  If those
@@ -2554,9 +2572,19 @@
         contents differ from the repository file at that path
         (which was downloaded as part of the checkout), the file
         will appear to have local modifications—the changes
+        ### TODO
         required to transform the versioned file you checked out
         into the unversioned file you had before checking
         out—when the checkout completes.</para>
+      -->
+      <para>在 Subversion 1.7 之前, 如果检出命令将要创建的文件已经在目录中存
+        在了, 那么默认情况下 Subversion 将会发出抱怨. Subversion 1.7 对这种
+        情况采取了不同的处理方式, 它将继续执行检出操作, 同时把所有妨碍命令的
+        对象都标记成目录冲突, 除非带上了选项 <option>--force</option>. 如果
+        检出命令带上了选项 <option>--force</option>, 那么工作副本中未被版本
+        控制的文件如果和检出命令将要创建的文件重名, 那么这些文件仍然会变成
+        被版本控制了的文件, 但是 Subversion 不会去修改文件内容, 所以说如果这
+        些已有的文件和仓库里的文件内容不一样, 文件将会包含本地修改.</para>
 
       <informalexample>
         <screen>
@@ -2586,10 +2614,14 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>As in another other working copy, you have the choices
         typically available:  reverting some or all of those
         local <quote>modifications</quote>, committing them, or
         continuing to modify your working copy.</para>
+      -->
+      <para>现在, 接下来你的选择有: 撤消全部或部分的本地 <quote>修改</quote>,
+        提交这些修改, 或继续修改你的工作副本. </para>
 
       <para>This feature is especially useful for performing
         in-place imports of unversioned directory trees.  By first