[svnbook] r5448 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Wed Oct 4 06:15:09 CDT 2017
Revision: 5448
http://sourceforge.net/p/svnbook/source/5448
Author: wuzhouhui
Date: 2017-10-04 11:15:09 +0000 (Wed, 04 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-04 01:04:25 UTC (rev 5447)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-10-04 11:15:09 UTC (rev 5448)
@@ -1,14 +1,21 @@
<!-- -*- sgml -*- -->
<chapter id="svn.branchmerge">
+ <!--
<title>Branching and Merging</title>
+ -->
+ <title>分支与合并</title>
<blockquote>
+ <!--
<attribution>Confucius</attribution>
+ -->
+ <attribution>孔子</attribution>
<para><quote>君子务本
(It is upon the Trunk that a gentleman works.)</quote></para>
</blockquote>
+ <!--
<para>Branching and merging are fundamental aspects of version
control, simple enough to explain conceptually but offering just
enough complexity and nuance to merit their own chapter in this
@@ -17,45 +24,77 @@
to them. If you've not familiarized yourself with Subversion's
basic concepts (found in <xref linkend="svn.basic"/>), we
recommend that you do so before reading this chapter.</para>
+ -->
+ <para>分支与合并是版本控制的基础功能, 从概念上解释非常简单, 但是它的复杂性
+ 和各种细微差别值得我们用整整一章进行介绍. 我们将会介绍这些操作背后的基本
+ 思想, 以及 Subversion 在实现上的某些独特之处. 如果读者对 Subversion 的基本
+ 概念 (见 <xref linkend="svn.basic"/>) 还不了解, 在阅读本章之前建议读者先
+ 了解它们.</para>
<!-- ================================================================= -->
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.branchmerge.whatis">
+ <!--
<title>What's a Branch?</title>
+ -->
+ <title>什么是分支</title>
+ <!--
<para>Suppose it's your job to maintain a document for a division
in your company—a handbook of some sort. One day a different
division asks you for the same handbook, but with a few parts
<quote>tweaked</quote> for them, since they do things slightly
differently.</para>
+ -->
+ <para>假设你的工作是为公司的某个部门维护文档—比如说一本手册. 一天,
+ 另一个部门也请你替他们维护同一份文档, 但需要根据他们的部门情况, 对手册的
+ 某些部分作一些修改.</para>
+ <!--
<para>What do you do in this situation? You do the obvious: make
a second copy of your document and begin maintaining the two
copies separately. As each department asks you to make small
changes, you incorporate them into one copy or the other.</para>
+ -->
+ <para>对于这种情况你应该怎么处理? 最容易想到的做法是为另一个部门创建一份
+ 文档的副本, 然后单独地对这两份文档进行维护. 每当部门要求对文档进行修改
+ 时, 你就把修改写到相应的文档里.</para>
+ <!--
<para>You often want to make the same change to both copies. For
example, if you discover a typo in the first copy, it's very
likely that the same typo exists in the second copy. The two
documents are almost the same, after all; they differ only in
small, specific ways.</para>
+ -->
+ <para>你应该会经常对两个副本做相同的修改, 比如说你在第一个副本时发现了一
+ 个打字错误, 同样的错误在第二个副本里也应该存在, 毕竟两份文档的大部分内容
+ 都是一样的.</para>
<para>
<indexterm>
<primary>branches</primary>
- </indexterm>This is the basic concept of a branch—namely,
+ </indexterm>
+ 这是分支的基本概念—顾名思义, 它是一条独立存在的开发线, 如果回溯地
+ 足够深, 将会看到它和其他分支共享相同的历史. 一个分支的生命总是开始于复
+ 制操作, 从那儿开始产生自己的历史 (见
+ <xref linkend="svn.branchmerge.whatis.dia-1"/>).</para>
+ <!--
+ This is the basic concept of a branch—namely,
a line of development that exists independently of another line,
yet still shares a common history if you look far enough back in
time. A branch always begins life as a copy of something, and
moves on from there, generating its own history (see
<xref linkend="svn.branchmerge.whatis.dia-1"/>).</para>
+ -->
<figure id="svn.branchmerge.whatis.dia-1">
- <title>Branches of development</title>
+ <title>分支示意图</title>
<graphic fileref="images/ch04dia1.png"/>
</figure>
+ <!--
<para>Subversion has commands to help you maintain parallel
branches of your files and directories. It allows you to create
branches by copying your data, and remembers that the copies are
@@ -64,6 +103,12 @@
your working copy reflect different branches so that you can
<quote>mix and match</quote> different lines of development in
your daily work.</para>
+ -->
+ <para>Subversion 提供了很多命令用于帮助用户维护文件与目录的并行分支, 这些
+ 命令允许你通过复制来创建分支, 并记住这些副本之间是有关的. 它们还可以帮助
+ 你把一个分支的修改复制到其他分支上. 最后, 它们可以把工作副本的某些部分
+ 调整成和分支对应的结构, 这样你就可以在日常工作中 <quote>混合与匹配</quote>
+ 不同的开发线.</para>
</sect1>
More information about the svnbook-dev
mailing list