[svnbook] r5316 committed - branches/1.8/zh/book/ ch01-fundamental-concepts.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5316
          http://sourceforge.net/p/svnbook/source/5316
Author:   wuzhouhui
Date:     2017-06-05 13:43:23 +0000 (Mon, 05 Jun 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 1 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch01-fundamental-concepts.xml

Modified: branches/1.8/zh/book/ch01-fundamental-concepts.xml
===================================================================
--- branches/1.8/zh/book/ch01-fundamental-concepts.xml	2017-06-05 13:06:53 UTC (rev 5315)
+++ branches/1.8/zh/book/ch01-fundamental-concepts.xml	2017-06-05 13:43:23 UTC (rev 5316)
@@ -1086,12 +1086,17 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.basic.in-action.wc">
+    <!--
       <title>Subversion Working Copies</title>
+    -->
+      <title>Subversion 的工作副本</title>
 
       <para>
         <indexterm>
           <primary>working copies</primary>
-        </indexterm>A Subversion working copy is an ordinary directory
+        </indexterm>
+    <!--
+        A Subversion working copy is an ordinary directory
         tree on your local system, containing a collection of files.
         You can edit these files however you wish, and if they're
         source code files, you can compile your program from them in
@@ -1100,7 +1105,14 @@
         changes, nor make your own changes available to others, until
         you explicitly tell it to do so.  You can even have multiple
         working copies of the same project.</para>
+    -->
+      一个 Subversion 工作副本是用户本地系统中的一个普通目录, 用户可以按照
+      自己的要求对存放在目录中的文件进行编辑, 如果是源代码文件, 用户也可以
+      按照通常的方式对它们进行编译. 工作副本是用户的私有工作空间: 除非用户
+      明确地要求 Subversion, 否则它不会向工作副本合并其他的修改, 也不会把
+      用户的修改暴露给其他人. 用户可以为同一个项目创建多个工作副本.</para>
 
+    <!--
       <para>After you've made some changes to the files in your
         working copy and verified that they work properly, Subversion
         provides you with commands to <quote>publish</quote> your
@@ -1113,6 +1125,14 @@
         everybody's changes in Subversion—changes aren't passed
         directly from working copy to working copy in the typical
         workflow.</para>
+    -->
+      <para>如果用户修改了工作副本中的文件, 并且确认了修改是正确的, 此时
+        可以使用 Subversion 提供的命令来 <quote>发布</quote> 修改 (通过
+        把修改保存到仓库中), 于是项目中的其他人就可以看到你的修改.
+        如果其他人也发布了他们的修改, Subversion 也提供了命令把他们的修改
+        合并到你的工作副本中 (通过读取仓库). 可以看到, 仓库是每个用户发布的
+        修改的中间人—修改并非从一个工作副本直接传递到另一个工作副本.
+      </para>
 
       <para>
         <indexterm>
@@ -1121,7 +1141,9 @@
         <indexterm>
           <primary>.svn</primary>
           <see>administrative directory</see>
-        </indexterm>A working copy also contains some extra files,
+        </indexterm>
+    <!--
+        A working copy also contains some extra files,
         created and maintained by Subversion, to help it carry out
         these commands.  In particular, each working copy contains a
         subdirectory named <filename>.svn</filename>, also known as
@@ -1130,8 +1152,16 @@
         directory help Subversion recognize which of your versioned
         files contain unpublished changes, and which files are out of
         date with respect to others' work.</para>
+    -->
+      工作副本还会包含一些额外的文件, 这些文件由 Subversion 创建并维护,
+      用于命令的正常运行. 每一个工作副本中都有一个名为
+      <filename>.svn</filename> 的子目录, 它是工作副本的
+      <firstterm>管理目录</firstterm> (<firstterm>administrative directory
+      </firstterm>). 管理目录中的文件可以帮助 Subversion 识别哪些文件含有
+      未发布的修改, 哪些文件是过时的.</para>
 
       <note>
+    <!--
         <para>Prior to version 1.7, Subversion
           maintained <filename>.svn</filename> administrative
           subdirectories in <emphasis>every</emphasis> versioned
@@ -1141,6 +1171,12 @@
           to this approach is that each working copy now has only
           one <filename>.svn</filename> subdirectory which is an
           immediate child of the root of that working copy.</para>
+    -->
+        <para>在 1.7 版以前, Subversion 在工作副本的每一个子目录内都维护了
+          一个 <filename>.svn</filename> 目录. Subversion 1.7 在存放和
+          维护工作副本元数据上提出了一种全新的方法, 从外面看最显著的变化
+          是每个工作副本只创建了一个 <filename>.svn</filename> 目录, 存
+          放在工作副本的根目录下.</para>
       </note>
 
       <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->