[svnbook] r5498 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Wed Nov 15 08:22:33 CST 2017
Revision: 5498
http://sourceforge.net/p/svnbook/source/5498
Author: wuzhouhui
Date: 2017-11-15 14:22:33 +0000 (Wed, 15 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-15 00:04:25 UTC (rev 5497)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-11-15 14:22:33 UTC (rev 5498)
@@ -4995,22 +4995,35 @@
(<option>-r</option>), 因此用户还可以把工作副本切换到分支的其他版本, 并
非只能是 <literal>HEAD</literal>.</para>
+ <!--
<para>Of course, most projects are more complicated than our
<filename>calc</filename> example, and contain multiple
subdirectories. Subversion users often follow a specific
algorithm when using branches:</para>
+ -->
+ <para>当然, 绝大多数项目都要比例子里的 <filename>calc</filename> 复杂得多,
+ 而且包含非常多的子目录, Subversion 用户在使用分支时经常遵循一些固定的
+ 步骤:</para>
<orderedlist>
<listitem>
+ <!--
<para>Copy the project's entire <quote>trunk</quote> to a new
branch directory.</para>
+ -->
+ <para>把项目的整个 <quote>主干</quote> 复制到一个新的分支目录.</para>
</listitem>
<listitem>
+ <!--
<para>Switch only <emphasis>part</emphasis> of the trunk
working copy to mirror the branch.</para>
+ -->
+ <para>只把主干工作副本的 <quote>一部分</quote> 进行切换, 以映射到另一
+ 个分支.</para>
</listitem>
</orderedlist>
+ <!--
<para>In other words, if a user knows that the branch work needs
to happen on only a specific subdirectory, she uses
<command>svn switch</command> to move only that subdirectory to
@@ -5023,15 +5036,29 @@
working copy</quote>—not only can working copies contain a
mixture of working revisions, but they can also contain a
mixture of repository locations as well.</para>
+ -->
+ <para>换句话说, 如果用户知道分支的工作只需要在某个特定的子目录内完成, 他
+ 就可以用 <command>svn switch</command>, 只把这个子目录切换到分支上
+ (用户甚至可以只切换一个文件!). 通过这种方式, 用户可以继续接收正常的
+ <quote>主干</quote> 更新到大部分的工作副本, 但不会更新已切换的部分 (除
+ 非有人向分支提交了修改). 这个特性给 <quote>混合的工作副本</quote>
+ 添加了新的一个维度—工作副本不仅可以包含混合的版本号, 甚至可以包含
+ 混合的仓库位置.</para>
<tip>
+ <!--
<para>Typically switched subdirectories share common ancestry with
the location which is switched <quote>away</quote> from. However
<command>svn switch</command> can switch a subdirectory to mirror
a repository location which it shares no common ancestry with.
To do this you need to use the
- <option>--ignore-ancestry</option> option.
+ <option>- -ignore-ancestry</option> option.
</para>
+ -->
+ <para>典型情况下, 已切换的子目录和 <quote>被切换走的</quote> 目录共享相同
+ 的祖先, 但 <command>svn switch</command> 也可以把子目录切换到一个不与
+ 原目录共享祖先的仓库位置, 方法是加上选项 <option>--ignore-ancestry
+ </option>.</para>
</tip>
<para>If your working copy contains a number of switched subtrees
More information about the svnbook-dev
mailing list