[svnbook] r5317 committed - branches/1.8/zh/book/ ch01-fundamental-concepts.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Jun 6 07:39:37 CDT 2017
Revision: 5317
http://sourceforge.net/p/svnbook/source/5317
Author: wuzhouhui
Date: 2017-06-06 12:39:36 +0000 (Tue, 06 Jun 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 1 in progress
Modified Paths:
--------------
branches/1.8/zh/book/ch01-fundamental-concepts.xml
Modified: branches/1.8/zh/book/ch01-fundamental-concepts.xml
===================================================================
--- branches/1.8/zh/book/ch01-fundamental-concepts.xml 2017-06-05 13:43:23 UTC (rev 5316)
+++ branches/1.8/zh/book/ch01-fundamental-concepts.xml 2017-06-06 12:39:36 UTC (rev 5317)
@@ -1181,10 +1181,16 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.basic.in-action.track-repos">
+ <!--
<title>How the working copy works</title>
+ -->
+ <title>工作副本的工作原理</title>
+ <!--
<para>For each file in a working directory, Subversion records
(among other things) two essential pieces of information:</para>
+ -->
+ <para>Subversion 为工作副本中的每一个文件记录两项信息:</para>
<itemizedlist>
<indexterm>
@@ -1193,24 +1199,40 @@
</indexterm>
<listitem>
+ <!--
<para>What revision your working file is based on (this is
called the file's <firstterm>working
revision</firstterm>)</para>
+ -->
+ <para>文件的版本号 (这被称为文件的 <firstterm>工作版本号</firstterm>
+ (<firstterm>working revision</firstterm>))</para>
</listitem>
<listitem>
+ <!--
<para>A timestamp recording when the local copy was last
updated by the repository</para>
+ -->
+ <para>一个时间戳, 记录了本地文件最近一次被仓库更新是在什么时候
+ </para>
</listitem>
</itemizedlist>
+ <!--
<para>Given this information, by talking to the repository,
Subversion can tell which of the following four states a
working file is in:</para>
+ -->
+ <para>有了这些信息后, 通过与仓库通信, Subversion 就可以判断出
+ 每一个工作文件处于以下 4 种状态中的哪一种:</para>
<variablelist>
<varlistentry>
+ <!--
<term>Unchanged, and current</term>
+ -->
+ <term>当前未修改的</term>
<listitem>
+ <!--
<para>The file is unchanged in the working directory, and
no changes to that file have been committed to the
repository since its working revision. An <command>svn
@@ -1217,12 +1239,20 @@
commit</command> of the file will do nothing, and an
<command>svn update</command> of the file will do
nothing.</para>
+ -->
+ <para>文件在工作副本中未被修改, 并且在工作版本号之后还没有
+ 人提交过该文件的修改. 对文件执行 <command>svn commit</command>
+ 和 <command>svn update</command> 都不会产生任何效果.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Locally changed, and current</term>
+ -->
+ <term>当前已修改的</term>
<listitem>
+ <!--
<para>The file has been changed in the working directory,
and no changes to that file have been committed to the
repository since you last updated. There are local
@@ -1230,12 +1260,21 @@
thus an <command>svn commit</command> of the file will
succeed in publishing your changes, and an <command>svn
update</command> of the file will do nothing.</para>
+ -->
+ <para>文件在工作副本中已被修改, 并且在一次更新以来还没有人
+ 向仓库提交过该文件的修改. 本地有未提交的修改, 于是执行
+ <command>svn commit</command> 将会成功地把修改提交到仓库中,
+ 而 <command>svn update</command> 不会产生任何修改.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Unchanged, and out of date</term>
+ -->
+ <term>过时未修改的</term>
<listitem>
+ <!--
<para>The file has not been changed in the working
directory, but it has been changed in the repository.
The file should eventually be updated in order to make
@@ -1244,12 +1283,22 @@
nothing, and an
<command>svn update</command> of the file will fold the
latest changes into your working copy.</para>
+ -->
+ <para>文件在工作副本中未被修改, 但是在上一次更新之后有人往
+ 仓库提交了该文件的修改. 为了让文件和最新版本保持同步, 应
+ 该执行更新操作. 对文件执行 <command>svn commit</command>
+ 不会产生任何效果, 执行 <command>svn update</command> 将
+ 把仓库中的最新修改合并到文件中.</para>
</listitem>
</varlistentry>
<varlistentry>
+ <!--
<term>Locally changed, and out of date</term>
+ -->
+ <term>过时且已修改的</term>
<listitem>
+ <!--
<para>The file has been changed both in the working
directory and in the repository. An <command>svn
commit</command> of the file will fail with an
@@ -1259,6 +1308,12 @@
changes. If Subversion can't complete the merge in a
plausible way automatically, it leaves it to the user to
resolve the conflict.</para>
+ -->
+ <para>文件在本地工作副本和仓库都被修改了. 对文件执行
+ <command>svn commit</command> 会由于文件已过时而失败.
+ 首先应该更新文件, 命令 <command>svn update</command> 试图
+ 把仓库的修改合并到本地. 如果 Subversion 不能自动地以一种
+ 合理的方式完成合并, 就会把冲突交由用户来解决.</para>
</listitem>
</varlistentry>
</variablelist>
@@ -1267,22 +1322,39 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<sect3 id="svn.basic.in-action.wc-funcdamentals">
+ <!--
<title>Fundamental working copy interactions</title>
+ -->
+ <title>工作副本的基本操作</title>
+ <!--
<para>A typical Subversion repository often holds the files (or
source code) for several projects; usually, each project is a
subdirectory in the repository's filesystem tree. In this
arrangement, a user's working copy will usually correspond to
a particular subtree of the repository.</para>
+ -->
+ <para>一个典型的 Subversion 仓库经常存放着若干个项目的文件,
+ 一般来说, 每一个项目都是仓库文件系统树的一个子目录. 在这种目录
+ 布局下, 用户的一个工作副本就对应着仓库中的一个特定子目录.</para>
+ <!--
<para>For example, suppose you have a repository that contains
two software projects, <literal>paint</literal> and
<literal>calc</literal>. Each project lives in its own
top-level subdirectory, as shown in <xref
linkend="svn.basic.in-action.wc.dia-1"/>.</para>
+ -->
+ <para>举例来说, 假设你有一个包含了两个软件项目的仓库, 这两个项目是
+ <literal>paint</literal> 和 <literal>calc</literal>, 每一个项目
+ 都有一个属于自己的目录, 如
+ <xref linkend="svn.basic.in-action.wc.dia-1"/> 所示.</para>
<figure id="svn.basic.in-action.wc.dia-1">
+ <!--
<title>The repository's filesystem</title>
+ -->
+ <title>仓库的文件系统</title>
<graphic fileref="images/ch02dia6.png"/>
</figure>
@@ -1299,7 +1371,9 @@
<primary>working copies</primary>
<secondary>creating</secondary>
<see>checking out</see>
- </indexterm>To get a working copy, you must <firstterm>check
+ </indexterm>
+ <!--
+ To get a working copy, you must <firstterm>check
out</firstterm> some subtree of the repository. (The term
<emphasis>check out</emphasis> may sound like it has something to do
with locking or reserving resources, but it doesn't; it simply
@@ -1306,6 +1380,12 @@
creates a working copy of the project for you.) For example,
if you check out <filename>/calc</filename>, you will get a
working copy like this:</para>
+ -->
+ 为了得到一个工作副本, 你必须 <firstterm>检出</firstterm>
+ (<firstterm>checkout</firstterm>) 仓库的某些子树 (术语
+ <emphasis>检出</emphasis> 听起来好像会涉及到加锁和资源的预留, 但实际
+ 上并没有, 它仅仅是为用户创建一份仓库的工作副本). 举例来说, 如果检出
+ <filename>/calc</filename>, 用户将会得到这样一份工作副本:</para>
<informalexample>
<screen>
@@ -1320,6 +1400,7 @@
</screen>
</informalexample>
+ <!--
<para>The list of letter <literal>A</literal>s in the left
margin indicates that Subversion is adding a number of items
to your working copy. You now have a personal copy of the
@@ -1327,6 +1408,12 @@
additional entry—<filename>.svn</filename>—which
holds the extra information needed by Subversion, as mentioned
earlier.</para>
+ -->
+ <para>靠近左边界的几个字母 <literal>A</literal> 指出 Subversion 正
+ 在往工作副本中添加项目 (item). 现在你就有了仓库
+ <literal>/calc</literal> 的一份私有副本, 外加一项额外的目录—
+ <filename>.svn</filename>—目录里存放了 Subversion 需要的
+ 额外信息, 我们在前面已经介绍过了.</para>
<para>
<indexterm>
More information about the svnbook-dev
mailing list