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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Fri Oct 20 21:53:27 CDT 2017


Revision: 5465
          http://sourceforge.net/p/svnbook/source/5465
Author:   wuzhouhui
Date:     2017-10-21 02:53:27 +0000 (Sat, 21 Oct 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-10-21 02:45:33 UTC (rev 5464)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-10-21 02:53:27 UTC (rev 5465)
@@ -2119,9 +2119,13 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Likewise, to see which changes are eligible to merge from the
-        trunk to the branch we can use the <option>--show-revs=eligible
+        trunk to the branch we can use the <option>- -show-revs=eligible
         </option> option:</para>
+      -->
+        <para>同样地, 为了查看分支可以从主干上合并哪些修改, 就用选项 <option>
+            --show-revs=eligible</option>:</para>
       <informalexample>
         <screen>
 $ svn mergeinfo ^/calc/trunk --show-revs eligible
@@ -2132,14 +2136,18 @@
       </informalexample>
 
       <sidebar id="svn.branchmerge.basicmerging.mergeinfo.operativerevs">
+      <!--
         <title>Operative and Inoperative Merge Revisions</title>
+      -->
+        <title>可实施与不可实施的版本号</title>
 
-        <para>The revision lists produced by the <option>--show-revs
+      <!--
+        <para>The revision lists produced by the <option>- -show-revs
           </option> option include only revisions which made (or would make)
           changes when merged.  So while we have merged a contiguous range of
           revisions (i.e. r341-378) from <filename>/calc/trunk</filename> to
           <filename>/calc/branches/my-calc-branch</filename>, only the
-          revisions listed with the <option>--show-revs=merged</option> option
+          revisions listed with the <option>- -show-revs=merged</option> option
           actually represent changes made on <filename>/calc/trunk</filename>.
           These revisions are described as <quote>operative</quote>
           revisions as regards merging, not to be confused with the
@@ -2148,8 +2156,22 @@
           revisions in the range r341-378 that are <emphasis>not</emphasis>
           listed as merged are termed <quote>inoperative</quote> revisions.
         </para>
+      -->
+        <para>选项 <option>--show-revs</option> 列出的版本号只包含了在合并时
+          (将) 会产生实际修改的版本号, 所以说当用户从
+          <filename>/calc/trunk</filename>
+          合并一段连续的版本号范围时 (例如 r341-378) 到 <filename>
+            /calc/branches/my-calc-branch</filename> 时, 只有那些包含在选项
+          <option>--show-revs=merged</option> 输出的列表中的版本号才真正地含
+          有针对 <filename>/cal/trunk</filename> 的修改, 对于合并而言, 这些
+          版本号被称为 <quote>可实施的版本号</quote>, 注意不要和选项
+          <option>-r</option> 使用的实施版本号搞混, 实施版本号见
+          <xref linkend="svn.advanced.pegrevs"/>. 反之, r341-378 中未出现在
+          选项 <option>--show-revs=merged</option> 输出的列表中的版本号被称
+          为 <quote>不可实施的版本号</quote>.</para>
       </sidebar>
 
+      <!--
       <para>The <command>svn mergeinfo</command> command requires
         a <quote>source</quote> URL (where the changes come
         from), and takes an optional <quote>target</quote> URL (where
@@ -2159,16 +2181,32 @@
         branch working copy, the command assumes we're interested in
         receiving changes to <filename>/calc/branches/my-calc-branch
         </filename> from the specified trunk URL.</para>
+      -->
+        <para>命令 <command>svn mergeinfo</command> 需要一个 <quote>源</quote>
+          URL (修改的来源), 接受一个可选的 <quote>目标</quote> URL (修改合并
+          的目标). 如果没有指定目标 URL, 命令就把当前工作目录当成目标. 在上面
+          的例子里, 因为我们要查询的是分支工作副本, 命令假定我们想知道的是主干
+          URL 上的哪些修改可以合并到 <filename>/calc/branches/my-calc-branch
+        </filename>.</para>
 
+      <!--
       <para>Since Subversion 1.7, the
         <command>svn mergeinfo</command> subcommand can also account for
         subtree mergeinfo and non-inheritable mergeinfo.  It accounts for
-        subtree mergeinfo by use of the <option>--recursive</option> or
-        <option>--depth</option> options, while non-inheritable mergeinfo
+        subtree mergeinfo by use of the <option>- -recursive</option> or
+        <option>- -depth</option> options, while non-inheritable mergeinfo
         is considered by default.</para>
+      -->
+      <para>从 Subversion 1.7 开始, <command>svn mergeinfo</command> 也可以
+        描述子目录合并信息和不可继承的合并信息. 为了描述子目录合并信息, 要加
+        上选项 <option>--recursive</option> 或 <option>--depth</option>,
+        而不可继承的合并信息本来就会被考虑到.</para>
 
       <sidebar id="svn.branchmerge.basicmerging.mergeinfo.inheritance">
+      <!--
         <title>Mergeinfo Inheritance</title>
+      -->
+        <title>合并信息继承</title>
 
         <para>
           <indexterm>
@@ -2178,7 +2216,14 @@
           <indexterm>
             <primary>mergeinfo</primary>
             <secondary>explicit</secondary>
-          </indexterm>When a path has
+          </indexterm>
+          如果某个路径具有属性 <literal>svn:mergeinfo</literal>, 我们就说它
+          含有 <firstterm>显式的合并信息</firstterm> (<firstterm>explicit
+            mergeinfo</firstterm>). 显式的合并信息不仅描述了合并到属性所在的
+          目录上的修改, 还描述了目录的子文件和子目录 (因为子文件和子目录继承了
+          父目录的合并信息), 例如:</para>
+      <!--
+          When a path has
           the <literal>svn:mergeinfo</literal> property set on it we
           say it has <firstterm>explicit mergeinfo</firstterm>.  This
           explicit mergeinfo describes not only what changes were
@@ -2185,6 +2230,7 @@
           merged into that particular directory, but also all the
           children of that directory (because those children inherit
           the mergeinfo of their parent path).  For example:</para>
+      -->
 
         <informalexample>
           <screen>




More information about the svnbook-dev mailing list