[svnbook] r5383 committed - branches/1.8/zh/book/ch03-advanced-topics.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Thu Aug 3 09:18:40 CDT 2017


Revision: 5383
          http://sourceforge.net/p/svnbook/source/5383
Author:   wuzhouhui
Date:     2017-08-03 14:18:40 +0000 (Thu, 03 Aug 2017)
Log Message:
-----------
1.8/zh: translation of chapter 3 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch03-advanced-topics.xml

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-02 12:46:14 UTC (rev 5382)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-08-03 14:18:40 UTC (rev 5383)
@@ -4187,6 +4187,7 @@
 </screen>
     </informalexample>
     
+    <!--
     <para>In this example, you have made some property modifications
       to <filename>button.c</filename>, but in your working copy, you
       also have some unversioned files: the latest
@@ -4195,6 +4196,7 @@
       <filename>data.c</filename>, and a set of debugging output
       logfiles.  Now, you know that your build system always results
       in the <filename>calculator</filename> program being
+      TODO
       generated.<footnote><para>Isn't that the whole point of a build
       system?</para></footnote>  And you know that your test suite
       always leaves those debugging logfiles lying around.  These
@@ -4206,6 +4208,18 @@
       <userinput>svn propedit svn:ignore calc</userinput> to add some
       ignore patterns to the <filename>calc</filename>
       directory.</para>
+    -->
+    <para>在上面的例子里, 用户已经修改了 <filename>button.c</filename>, 但是
+      工作副本里还有一些未被版本控制的项目: 刚从源代码编译出的 <filename>
+        calculator</filename> 程序, 一个名为 <filename>data.c</filename> 的
+      源代码文件, 还有几个用于调试的日志文件. 假设用户已经知道编译系统总是会
+      输出一个目标文件 <filename>calculator</filename><footnote><para>这是否就
+          是编译系统的全部功能?</para></footnote>, 而且测试程序总是会留下一些
+      调试日志文件, 除了用户自己的工作副本, 该项目所有的工作副本都有可能出现
+      这些文件. 用户非常清楚地知道, 当他执行 <command>svn status</command> 时,
+      并不想看到这些他不感兴趣的文件, 而且他也相信其他人也对它们不感兴趣. 于是,
+      用户决定为目录 <filename>calc</filename> 设置属性 <literal>svn:ignore
+    </literal>:</para>
 
     <informalexample>
       <screen>
@@ -4216,10 +4230,14 @@
 </screen>
     </informalexample>
     
+    <!--
     <para>After you've added this property, you will now have a local
       property modification on the <filename>calc</filename>
       directory.  But notice what else is different about your
       <command>svn status</command> output:</para>
+    -->
+    <para>属性设置完毕后, 目录 <filename>calc</filename> 包含了未被提交的本地
+      修改. 注意 <command>svn status</command> 的输出发生了什么变化:</para>
 
     <informalexample>
       <screen>
@@ -4230,6 +4248,7 @@
 </screen>
     </informalexample>
     
+    <!--
     <para>Now, all that cruft is missing from the output!  Your
       <filename>calculator</filename> compiled program and all those
       logfiles are still in your working copy; Subversion just isn't
@@ -4238,11 +4257,22 @@
       display, you are left with more intriguing items—such as
       that source code file <filename>data.c</filename> that you
       probably forgot to add to version control.</para>
+    -->
+    <para>现在, 命令的输出变得干净多了! 编辑器产生的目标文件 <filename>
+        calculator</filename> 和日志文件仍然留在工作副本里, Subversion 只是不
+      再提醒用户这些文件的存在. 输出变干净后, 用户就能更容易地关注到更重要的
+      事情上—例如用户可能忘记把源代码文件 <filename>data.c</filename>
+      添加到仓库里.</para>
 
+    <!--
     <para>Of course, this less-verbose report of your working copy
       status isn't the only one available.  If you actually want to
       see the ignored files as part of the status report, you can pass
-      the <option>--no-ignore</option> option to Subversion:</para>
+      the <option>- -no-ignore</option> option to Subversion:</para>
+    -->
+    <para>当然, 减少垃圾信息只是一个选择, 如果用户确实想看到所有的文件, 包括
+      正常情况下会被忽略的文件, 可以给 <command>svn status</command> 加上选项
+      <option>--no-ignore</option>:</para>
 
     <informalexample>
       <screen>




More information about the svnbook-dev mailing list