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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Tue Nov 7 06:51:28 CST 2017


Revision: 5483
          http://sourceforge.net/p/svnbook/source/5483
Author:   wuzhouhui
Date:     2017-11-07 12:51:28 +0000 (Tue, 07 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-06 12:36:19 UTC (rev 5482)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-07 12:51:28 UTC (rev 5483)
@@ -4122,8 +4122,12 @@
 
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.advanced.logblame">
+      <!--
       <title>Merge-Sensitive Logs and Annotations</title>
+      -->
+      <title>对合并敏感的日志与注释</title>
 
+      <!--
       <para>One of the main features of any version control system is
         to keep track of who changed what, and when they did it.
         The <command>svn log</command> and <command>svn
@@ -4131,12 +4135,23 @@
         invoked on individual files, they show not only the history of
         changesets that affected the file, but also exactly which user
         wrote which line of code, and when she did it.</para>
+      -->
+      <para>任意一个版本控制系统都需要支持的一项特性是能够查看是谁, 在什么时
+        候, 修改了什么地方, Subversion 完成这些功能的命令是 <command>svn
+          log</command> 和 <command>svn blame</command>. 在单独的文件上执行
+        这两个命令时, 它们不仅会显示影响文件的变更集历史, 还可以精确地指出
+        每一行是哪个用户, 在什么时候修改的.</para>
 
+      <!--
       <para>When changes start getting replicated between branches,
         however, things start to get complicated.  For example, if you
         were to ask <command>svn log</command> about the history of
         your feature branch, it would show exactly every revision that ever
         affected the branch:</para>
+      -->
+      <para>然而, 当修改在分支间复制时, 事情开始变得复杂起来. 比如说用
+        <command>svn log</command> 查询特性分支的历史, 命令将会显示所有影响
+        过分支的版本号:</para>
 
       <informalexample>
         <screen>
@@ -4161,6 +4176,7 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>But is this really an accurate picture of all the changes
         that happened on the branch?  What's left out here is
         the fact that revisions 352, 362, 372 and 379 were actually the
@@ -4167,6 +4183,10 @@
         results of merging changes from the trunk.  If you look at one
         of these logs in detail, the multiple trunk changesets that
         comprised the branch change are nowhere to be seen:</para>
+      -->
+      <para>但是这些日志完整地刻画了分支上的所有修改吗? 输出中没有明确指出的是
+        r352, r362, r372 和 r379 其实是从主干合并修改的结果. 如果你详细地查看
+        这几个日志将会发现我们没办法看到构成分支修改的多个主干变更集:</para>
 
       <informalexample>
         <screen>
@@ -4185,12 +4205,17 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>We happen to know that this merge to the branch was
         nothing but a merge of trunk changes.  How can we see those
         trunk changes as well?  The answer is to use the
-        <option>--use-merge-history</option> (<option>-g</option>)
+        <option>- -use-merge-history</option> (<option>-g</option>)
         option.  This option expands those <quote>child</quote>
         changes that were part of the merge.</para>
+      -->
+      <para>我们知道被合并的修改来自主干, 那么如何同时查看主干上的这些修改
+        历史? 答案是使用选项 <option>--use-merge-history</option> (<option>-g
+      </option>), 展开被合并的 <quote>子</quote> 修改.</para>
 
       <informalexample>
         <screen>
@@ -4233,10 +4258,16 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>By making the log operation use merge history, we see not
         just the revision we queried (r352), but also the other revisions
         that came along on the ride with it—Sally's work on trunk.
         This is a much more complete picture of history!</para>
+      -->
+      <para>为了 <command>svn log</command> 增加选项 <option>--use-merge-history
+        </option> (<option>-g</option>), 我们不仅可以看到 r352, 还可以看到通过
+        r352 从主干合并到分支的提交, 这些提交是 Sally 在主干上的工作. 这才是历
+        史的更完整的刻画!</para>
 
       <para>The <command>svn blame</command> command also takes the
         <option>--use-merge-history</option> (<option>-g</option>)




More information about the svnbook-dev mailing list