[svnbook] r5910 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Apr 6 21:32:58 CDT 2019
Revision: 5910
http://sourceforge.net/p/svnbook/source/5910
Author: wuzhouhui
Date: 2019-04-07 02:32:56 +0000 (Sun, 07 Apr 2019)
Log Message:
-----------
1.8/zh: translation of svn reference in progress
Modified Paths:
--------------
branches/1.8/zh/book/ref-svn.xml
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml 2019-04-06 02:53:58 UTC (rev 5909)
+++ branches/1.8/zh/book/ref-svn.xml 2019-04-07 02:32:56 UTC (rev 5910)
@@ -5642,6 +5642,7 @@
</listitem>
</itemizedlist>
+ <!--
<para>If
<xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
is active, then Subversion will internally track metadata
@@ -5654,19 +5655,38 @@
account when determining what revisions to merge and in an
effort to avoid repeat merges and needless conflicts it may
only merge a subset of the requested ranges.</para>
+ -->
+ <para>当两个合并的源路径具有祖先关系时—第一个源路径是另一个源路径
+ 的祖先, 或反之 (自动合并总是符合这一条件—如果 <xref
+ linkend="svn.branchmerge.basicmerging.mergetracking"/> 是可用的,
+ 则 Subversion 会在内部更新合并操作的元数据. 在判断需要合并哪些版本号
+ 时, Subversion 还会把工作副本目标路径上已存在的合并元数据考虑进来,
+ 从而避免重复的合并和不必要的冲突.</para>
+ <!--
<para>Unlike <command>svn diff</command>, the merge command
takes the ancestry of a file into consideration when
performing a merge operation. This is very important when
you're merging changes from one branch into another and you've
renamed a file on one branch but not the other.</para>
+ -->
+ <para>和 <command>svn diff</command> 不一样的是, <command>svn
+ merge</command> 在执行合并时还会考虑到文件的祖先, 这在处理下面这种
+ 情况时非常有用: 把一个分支上的修改合并到另一个分支中, 而在其中一个分
+ 支中文件被重命名了.</para>
<tip>
- <para>The <option>--ignore-ancestry</option> option will cause
+ <!--
+ <para>The <option>- -ignore-ancestry</option> option will cause
<xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
to be disabled and makes merge act like
<command>svn diff</command>, ignoring the ancestry of files
when merging.</para>
+ -->
+ <para>选项 <option>--ignore-ancestry</option> 将禁止 <xref
+ linkend="svn.branchmerge.basicmerging.mergetracking"/>, 使得
+ <command>svn merge</command> 在合并时不考虑祖先关系, 就像
+ <command>svn diff</command> 那样工作.</para>
</tip>
</refsect1>
@@ -5673,7 +5693,10 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -5697,14 +5720,24 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Reintegrate a branch back into the trunk—assuming
that you have an up-to-date working copy of the trunk (the
- <option>--verbose</option> option prints additional
+ <option>- -verbose</option> option prints additional
information regarding what the merge is doing prior to
+ ### TODO
actually applying any diff; useful in very large which
might take a significant amount of time to complete):</para>
+ -->
+ <para>把分支重新整合到主干上—假设你已经有了一个处于最新状态
+ 下的主干工作副本 (选项 <option>--verbose</option> 使得 <command>svn
+ merge</command> 在应用差异前打印额外的信息, 这些信息指出了现在
+ 正在执行什么合并):</para>
<informalexample>
<screen>
@@ -5727,7 +5760,10 @@
</screen>
</informalexample>
+ <!--
<para>Cherry-pick merge a single change to a file:</para>
+ -->
+ <para>为文件合并一个单独的修改 (精选合并):</para>
<informalexample>
<screen>
@@ -5739,8 +5775,11 @@
</screen>
</informalexample>
+ <!--
<para>Merge the differences between two unrelated branches
into a third branch:</para>
+ -->
+ <para>把两个不相关的分支间的差异合并到第三个分支上:</para>
<informalexample>
<screen>
@@ -5767,9 +5806,13 @@
<refnamediv>
<refname>svn mergeinfo</refname>
+ <!--
<refpurpose>Query merge-related information. See <xref
linkend="svn.branchmerge.basicmerging.mergeinfo"/> for
details.</refpurpose>
+ -->
+ <refpurpose>查询合并信息, 见 <xref
+ linkend="svn.branchmerge.basicmerging.mergeinfo"/>.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -5779,23 +5822,36 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>Query information related to merges (or potential
merges) between <replaceable>SOURCE-URL</replaceable> and
<replaceable>TARGET</replaceable>. If
- the <option>--show-revs</option> option is not provided,
+ the <option>- -show-revs</option> option is not provided,
display a graphical representation of revisions which have
been fully merged from <replaceable>SOURCE-URL</replaceable>
to <replaceable>TARGET</replaceable>. Otherwise, list
either the <literal>merged</literal>
or <literal>eligible</literal> revisions as specified by
- the <option>--show-revs</option> option.</para>
+ the <option>- -show-revs</option> option.</para>
+ -->
+ <para>查询 <replaceable>SOURCE-URL</replaceable> 和
+ <replaceable>TARGET</replaceable> 之间与合并 (或潜在的合并) 相关的
+ 信息. 如果没有添加选项 <option>--show-revs</option>, 命令会把已合并
+ 的版本号以图形化的方式打印出来; 否则的话, 命令将会列出已合并或可以
+ 合并 (但还未合并) 的版本号.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -5809,10 +5865,16 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Graphical summary of the merges from one branch to
another:</para>
+ -->
+ <para>以图形化的方式总结从一个分支合并到另一个分支上的修改:</para>
<informalexample>
<screen>
@@ -5832,8 +5894,11 @@
</screen>
</informalexample>
+ <!--
<para>List the operative revisions merged from one branch to
another:</para>
+ -->
+ <para>列出某个分支上已经合并到另一个分支的所有版本号:</para>
<informalexample>
<screen>
@@ -5843,8 +5908,11 @@
</screen>
</informalexample>
+ <!--
<para>List the operative revisions eligible to be merged from
one branch to another:</para>
+ -->
+ <para>列出某个分支上可以合并 (但还未合并) 到另一个分支的版本号:</para>
<informalexample>
<screen>
@@ -5871,7 +5939,10 @@
<refnamediv>
<refname>svn mkdir</refname>
+ <!--
<refpurpose>Create a new directory under version control.</refpurpose>
+ -->
+ <refpurpose>创建一个新目录.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -5881,8 +5952,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>Create a directory with a name given by the final
component of the <replaceable>PATH</replaceable> or <replaceable>URL</replaceable>.
A directory specified by a working copy
@@ -5891,13 +5966,24 @@
created in the repository via an immediate commit.
Multiple directory URLs are committed atomically. In both
cases, all the intermediate directories must already exist
- unless the <option>--parents</option> option is
+ unless the <option>- -parents</option> option is
used.</para>
+ -->
+ <para>创建一个新目录, 新目录的名字是 <replaceable>PATH</replaceable>
+ 或 <replaceable>URL</replaceable> 的最后一个分量. 如果参数是工作副本
+ 路径 <replaceable>PATH</replaceable>, 那么目录在创建后被自动置于版本
+ 控制之下; 如果参数是 <replaceable>URL</replaceable>, 那么新目录会被
+ 直接提交到仓库中, 如果出现了多个 <replaceable>URL</replaceable>, 则
+ 它们都是在同一个版本号中提交. 除非添加了选项
+ <option>--parents</option>, 否则的话中间目录必须事先存在.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -5915,9 +6001,15 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Create a directory in your working copy:</para>
+ -->
+ <para>在工作副本中创建新目录:</para>
<informalexample>
<screen>
@@ -5926,8 +6018,12 @@
</screen>
</informalexample>
+ <!--
<para>Create one in the repository (this is an instant commit, so a
log message is required):</para>
+ -->
+ <para>在仓库中创建目录 (这会马上产生一个提交操作, 所以必须提供日志消息):
+ </para>
<informalexample>
<screen>
More information about the svnbook-dev
mailing list