[svnbook] r5478 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Oct 31 08:00:26 CDT 2017
Revision: 5478
http://sourceforge.net/p/svnbook/source/5478
Author: wuzhouhui
Date: 2017-10-31 13:00:26 +0000 (Tue, 31 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-30 12:53:25 UTC (rev 5477)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-10-31 13:00:26 UTC (rev 5478)
@@ -3414,18 +3414,31 @@
<!-- =============================================================== -->
<sect2 id="svn.branchmerge.nomergedata">
+ <!--
<title>Merges Without Mergeinfo</title>
+ -->
+ <title>没有合并信息的合并</title>
+ <!--
<para>Subversion tries to generate merge metadata whenever it
can, to make future invocations of <command>svn
merge</command> smarter. There are still situations, however,
where <literal>svn:mergeinfo</literal> data is not created or
changed. Remember to be a bit wary of these scenarios:</para>
+ -->
+ <para>如果可能的话, Subversion 都会去尝试生成合并的元数据, 从而帮助后面
+ 调用 <command>svn merge</command> 更加智能, 但在某些情况下, <literal>
+ svn:mergeinfo</literal> 既不会被创建, 也不会被更新, 对这些情况要稍
+ 微注意一点:</para>
<variablelist>
<varlistentry>
+ <!--
<term>Merging unrelated sources</term>
+ -->
+ <term>合并不相关的源</term>
<listitem>
+ <!--
<para>If you ask <command>svn merge</command> to compare
two URLs that aren't related to each other, a patch is
still generated and applied to your working copy, but
@@ -3433,12 +3446,21 @@
history between the two sources, and
future <quote>smart</quote> merges depend on that common
history.</para>
+ -->
+ <para>如果用户要求 Subversion 去比较两个完全不相关的 URL, 那么
+ Subversion 仍然会生成补丁并应用到工作副本上, 但不会创建或更新
+ 合并元数据. 因为两个源之间没有公共的历史, 而将来的 <quote>智能
+ </quote> 合并需要这些公共历史.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Merging from foreign repositories</term>
+ -->
+ <term>合并外部仓库</term>
<listitem>
+ <!--
<para>While it's possible to run a command such
as <userinput>svn merge -r 100:200
<replaceable>http://svn.foreignproject.com/repos/trunk</replaceable></userinput>,
@@ -3446,12 +3468,22 @@
metadata. At the time of this writing, Subversion has no
way of representing different repository URLs within
the <literal>svn:mergeinfo</literal> property.</para>
+ -->
+ <para>虽然执行这样一条命令—<userinput>svn merge -r 100:200
+ <replaceable>http://svn.foreignproject.com/repos/trunk
+ </replaceable></userinput>—是可以的, 但生成的补丁依然缺少
+ 合并元数据. 在撰写本书时, Subversion 还不支持在属性 <literal>
+ svn:mergeinfo</literal> 内表示多个不同仓库的 URL.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term>Using <option>--ignore-ancestry</option></term>
+ <!--
+ <term>Using <option>- -ignore-ancestry</option></term>
+ -->
+ <term>使用<option>--ignore-ancestry</option></term>
<listitem>
+ <!--
<para>If this option is passed to <command>svn
merge</command>, it causes the merging logic to
mindlessly generate differences the same way
@@ -3459,11 +3491,20 @@
historical relationships. We discuss this later in this
chapter in
<xref linkend="svn.branchmerge.advanced.ancestry"/>.</para>
+ -->
+ <para>如果向命令 <command>svn merge</command> 传递选项 <option>
+ --ignore-ancestry</option>, 这将导致 <command>svn merge
+ </command> 按照和 <command>svn diff</command> 相同的方式生成
+ 不含有历史的差异, 更多的内容将在
+ <xref linkend="svn.branchmerge.advanced.ancestry"/> 介绍.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Applying reverse merges from a target's natural history</term>
+ -->
+ <term>反向合并目标的修改历史</term>
<listitem>
<para>Earlier in this chapter
(<xref linkend="svn.branchmerge.basicmerging.undo"/>) we
More information about the svnbook-dev
mailing list