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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Wed Nov 8 07:28:28 CST 2017


Revision: 5484
          http://sourceforge.net/p/svnbook/source/5484
Author:   wuzhouhui
Date:     2017-11-08 13:28:28 +0000 (Wed, 08 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-07 12:51:28 UTC (rev 5483)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-08 13:28:28 UTC (rev 5484)
@@ -4269,12 +4269,18 @@
         r352 从主干合并到分支的提交, 这些提交是 Sally 在主干上的工作. 这才是历
         史的更完整的刻画!</para>
 
+      <!--
       <para>The <command>svn blame</command> command also takes the
-        <option>--use-merge-history</option> (<option>-g</option>)
+        <option>- -use-merge-history</option> (<option>-g</option>)
         option.  If this option is neglected, somebody looking at
         a line-by-line annotation of <filename>Makefile</filename> may
         get the mistaken impression that you were responsible for a
         particular change:</para>
+      -->
+      <para>命令 <command>svn blame</command> 也支持选项 <option>
+          --use-merge-history</option> (<option>-g</option>), 如果在执行命令时
+        没有带上该选项, 在查看 <filename>button.c</filename> 每一行的修改注释
+        时, 用户可能会对修改的负责人产生错误的印象:</para>
 
       <informalexample>
         <screen>
@@ -4291,6 +4297,9 @@
         three lines in revision 352, two of them were actually written
         by Sally back in revision 348 and were brought into your branch
         via a sync merge:</para>
+      <para>用户 <literal>user</literal> 的确在 r352 提交了这 3 行修改, 但其中
+        2 行实际上来自 Sally 在 r348 的修改, 它们通过同步合并被合并到了分支中:
+      </para>
 
       <informalexample>
         <screen>
@@ -4303,8 +4312,12 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Now we know who to <emphasis>really</emphasis> blame for
         those two lines of code!</para>
+      -->
+      <para>现在我们知道了是谁应该 <emphasis>真正地</emphasis> 为这 2 行修改
+        负责!</para>
 
     </sect2>
 




More information about the svnbook-dev mailing list