[svnbook] r5845 committed - branches/1.8/zh/book/ch07-customizing-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5845
          http://sourceforge.net/p/svnbook/source/5845
Author:   wuzhouhui
Date:     2018-12-11 13:40:49 +0000 (Tue, 11 Dec 2018)
Log Message:
-----------
1.8/zh: translation of chapter 7 in progress

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

Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-09 04:29:19 UTC (rev 5844)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-11 13:40:49 UTC (rev 5845)
@@ -847,11 +847,13 @@
           <varlistentry>
             <term><literal>preserved-conflict-file-exts</literal></term>
             <listitem>
+      <!--
               <para>The value of this option is a space-delimited list
                 of file extensions that Subversion should preserve
                 when generating conflict filenames.  By default, the
                 list is empty.  This option is new to Subversion
                 1.5.</para>
+      -->
               <para>选项的值是由空格分隔的文件扩展名列表, 当 Subversion 生成
                 冲突文件名时必须保留这些扩展名. 选项在 Subversion 1.5 引入,
                 默认值为空.</para>
@@ -933,6 +935,7 @@
           <varlistentry>
             <term><literal>use-commit-times</literal></term>
             <listitem>         
+      <!--
               <para>Normally your working copy files have timestamps
                 that reflect the last time they were touched by any
                 process, whether your own editor or some
@@ -940,7 +943,14 @@
                 convenient for people developing software, because
                 build systems often look at timestamps as a way of
                 deciding which files need to be recompiled.</para>
+      -->
+              <para>通常情况下, 工作副本里的文件包含了能够反映文件最后一次是
+                在什么时候被进程—例如文本编辑器或 <command>svn</command>
+                命令—修改了的时间戳. 这个时间戳对于软件开发非常有用, 因
+                为软件构建系统通过查看时间戳来决定是否需要重新编译某个文件.
+              </para>
 
+      <!--
               <para>In other situations, however, it's sometimes nice
                 for the working copy files to have timestamps that
                 reflect the last time they were changed in the
@@ -953,10 +963,21 @@
                 <command>svn switch</command>, and <command>svn
                 revert</command> commands will also set last-commit
                 timestamps on files that they touch.</para>
+      -->
+              <para>然而在其他场景下, 如果这个时间戳反映的是工作副本里的文件
+                最后一次在仓库里被修改的时间—那将会非常方便. 命令
+                <command>svn export</command> 总是把它所生成的目录树的时间
+                戳设置成 <quote>最后一次提交的时间</quote>. 如果把
+                <literal>use-commit-times</literal> 设置成
+                <literal>yes</literal>, 那么命令 <command>svn
+                  checkout</command>, <command>svn update</command>,
+                <command>svn switch</command> 和 <command>svn revert</command>
+                也会把它们所修改的文件的时间戳设置成最后一次提交的时间.</para>
             </listitem>
           </varlistentry>
         </variablelist>
 
+      <!--
         <para>The <literal>[auto-props]</literal> section controls the
           Subversion client's ability to automatically set properties
           on files when they are added or imported.  It contains any
@@ -969,6 +990,14 @@
           assignments.  (If you need to use a semicolon in your
           property's name or value, you can escape it by doubling
           it.)</para>
+      -->
+        <para><literal>[auto-props]</literal> 节控制着 Subversion 客户端如何
+          为新增和导入的文件自动设置属性. 它包含了任意数量的键值对, 键值对的
+          格式是 <literal><replaceable>PATTERN</replaceable>
+          = <replaceable>PROPNAME</replaceable>=<replaceable>VALUE</replaceable>[;<replaceable>PROPNAME</replaceable>=<replaceable>VALUE</replaceable>
+          ...]</literal>, 其中 <replaceable>PATTERN</replaceable> 是一个文件
+        名模式, 用于匹配一个或多个文件名, 剩下的部分是分号分隔的属性赋值语句.
+        (如果在属性名或属性值中需要用到分号, 就连着写两次分号来转义.)</para>
 
         <informalexample>
           <screen>