[svnbook] r5492 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Nov 14 07:24:10 CST 2017
Revision: 5492
http://sourceforge.net/p/svnbook/source/5492
Author: wuzhouhui
Date: 2017-11-14 13:24:10 +0000 (Tue, 14 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-13 14:14:42 UTC (rev 5491)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-11-14 13:24:10 UTC (rev 5492)
@@ -4862,30 +4862,51 @@
<xref linkend="svn.branchmerge.advanced.blockchanges"/>).</para>
</listitem>
<listitem>
+ <!--
<para>Your merge target should be a working copy which
represents the root of a <emphasis>complete</emphasis> tree
representing a <emphasis>single</emphasis> location in the
repository at a single point in time:
+ -->
+ <para>被合并的目标应该是一个工作副本, 代表了一个 <emphasis>完整的
+ </emphasis> 目录的根, 这个目录则代表了某一时刻, 仓库的一个单一
+ 位置:
<itemizedlist>
<listitem>
+ <!--
<para>Update before you merge! Don't use the <option>
- --allow-mixed-revisions</option> option to merge into
+ - -allow-mixed-revisions</option> option to merge into
mixed-revision working copies.</para>
+ -->
+ <para>在合并前更新! 不要使用选项 <option>--allow-mixed-revisions
+ </option> 去合并含有混合版本号的工作副本.</para>
</listitem>
<listitem>
+ <!--
<para>Don't merge to targets with <quote>switched</quote>
subdirectories (as described next in
<xref linkend="svn.branchmerge.switchwc"/>).</para>
+ -->
+ <para>不要合并带有 <quote>已切换的</quote> 子目录的目标 (在
+ <xref linkend="svn.branchmerge.switchwc"/> 介绍).</para>
</listitem>
<listitem>
+ <!--
<para>Avoid merges to targets with sparse directories.
Likewise, don't merge to depths other than
- <option>--depth=infinity</option></para>
+ <option>- -depth=infinity</option></para>
+ -->
+ <para>避免合并含有稀疏目录的目标, 类似地, 也不要合并深度不是
+ <option>--depth=infinity</option> 的目标.</para>
</listitem>
<listitem>
+ <!--
<para>Be sure you have read access to all of the merge
source and read/write access to all of the merge
target.</para>
+ -->
+ <para>确保你对合并的源具有读权限, 对被合并的目标具有读写权限.
+ </para>
</listitem>
</itemizedlist>
</para>
@@ -4892,9 +4913,13 @@
</listitem>
</itemizedlist>
+ <!--
<para>Of course sometimes you may need to violate some of these
best practices. Don't worry if you need to, just be sure you
understand the ramifications of doing so.</para>
+ -->
+ <para>当然, 有时候你并不能完全按照上面所说的要求去做, 此时也不用担心, 只
+ 要你知道这样做的后果就行.</para>
</sect2>
@@ -4904,8 +4929,12 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.branchmerge.switchwc">
+ <!--
<title>Traversing Branches</title>
+ -->
+ <title>遍历分支</title>
+ <!--
<para>The <command>svn switch</command> command transforms an
existing working copy to reflect a different branch. While this
command isn't strictly necessary for working with branches, it
@@ -4915,6 +4944,12 @@
simply ask Subversion to change your working copy of
<filename>/calc/trunk</filename> to mirror the new branch
location:</para>
+ -->
+ <para>命令 <command>svn switch</command> 转换一个已有的工作副本, 使其映射
+ 到另一个不同的分支. 虽然在使用分支时, 该命令并不是必须的, 但它提供了很
+ 方便的快捷键. 在一个我们讲过的例子里, 当用户创建完私有分支后, 检出了该
+ 分支的工作副本. 现在用户多了一种选择, 用命令 <command>svn switch</command>
+ 把 <filename>/calc/trunk</filename> 的工作副本映射新创建的分支:</para>
<informalexample>
<screen>
@@ -4934,6 +4969,7 @@
</screen>
</informalexample>
+ <!--
<para><quote>Switching</quote> a working copy that has no local
modifications to a different branch results in the working copy
looking just as it would if you'd done a fresh checkout of the
@@ -4942,11 +4978,21 @@
degree. The server sends only the minimal set of changes
necessary to make your working copy reflect the branch
directory.</para>
+ -->
+ <para><quote>切换</quote> 一个不含有本地修改的工作副本到另一个分支, 最终
+ 得到的工作副本就像是从分支上检出的一样. 使用 <command>svn switch</command>
+ 切换分支通常会更有效率, 因为分支之间的差异通常很小, 服务器只需要发送一
+ 小部分数据, 就可以让工作副本映射到一个新的分支.</para>
+ <!--
<para>The <command>svn switch</command> command also takes a
- <option>--revision</option> (<option>-r</option>) option, so you
+ <option>- -revision</option> (<option>-r</option>) option, so you
need not always move your working copy to the
<literal>HEAD</literal> of the branch.</para>
+ -->
+ <para><command>svn switch</command> 支持选项 <option>--revision</option>
+ (<option>-r</option>), 因此用户还可以把工作副本切换到分支的其他版本, 并
+ 非只能是 <literal>HEAD</literal>.</para>
<para>Of course, most projects are more complicated than our
<filename>calc</filename> example, and contain multiple
More information about the svnbook-dev
mailing list