[svnbook] r5968 committed - branches/1.8/zh/book/ appb-svn-for-cvs-users.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Aug 17 22:24:45 CDT 2019
Revision: 5968
http://sourceforge.net/p/svnbook/source/5968
Author: wuzhouhui
Date: 2019-08-18 03:24:43 +0000 (Sun, 18 Aug 2019)
Log Message:
-----------
1.8/zh: translation of appendix B in progress
Modified Paths:
--------------
branches/1.8/zh/book/appb-svn-for-cvs-users.xml
Modified: branches/1.8/zh/book/appb-svn-for-cvs-users.xml
===================================================================
--- branches/1.8/zh/book/appb-svn-for-cvs-users.xml 2019-08-17 14:46:28 UTC (rev 5967)
+++ branches/1.8/zh/book/appb-svn-for-cvs-users.xml 2019-08-18 03:24:43 UTC (rev 5968)
@@ -1,20 +1,34 @@
<!-- -*- sgml -*- -->
<appendix id="svn.forcvs">
+ <!--
<title>Subversion for CVS Users</title>
+ -->
+ <title>针对 CVS 用户的 Subversion 介绍</title>
+ <!--
<para>This appendix is a guide for CVS users new to Subversion.
It's essentially a list of differences between the two systems
as <quote>viewed from 10,000 feet.</quote> For each section, we
provide references to relevant chapters when
possible.</para>
+ -->
+ <para>本附录是一篇针对 CVS 用户的 Subversion 介绍, 实际上是从较高的层次
+ 介绍 Subversion 与 CVS 的区别. 在每一小节, (如果可能的话) 我们都会给出
+ 相关章节的链接.</para>
+ <!--
<para>Although the goal of Subversion is to take over the current
and future CVS user base, some new features and design changes
were required to fix certain <quote>broken</quote> behaviors
that CVS had. This means that, as a CVS user, you may need to
+ ### TODO
break habits—ones that you forgot were odd to begin
with.</para>
+ -->
+ <para>虽然 Subversion 目标是完全取代 CVS, 但是为了克服 CVS 的某些
+ <quote>缺陷</quote>, 新的特性和设计上的变化要求 CVS 用户必须改掉某些
+ 习惯.</para>
<!-- ================================================================= -->
@@ -21,13 +35,22 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.forcvs.revnums">
+ <!--
<title>Revision Numbers Are Different Now</title>
+ -->
+ <title>版本号的编号不再相同</title>
+ <!--
<para>In CVS, revision numbers are per file. This is because CVS
stores its data in RCS files; each file has a corresponding RCS
file in the repository, and the repository is roughly laid out
according to the structure of your project tree.</para>
+ -->
+ <para>在 CVS 中, 版本号的编号是特定于每个文件的, 这是因为 CVS 把数据
+ 存放在 RCS 文件中, 每个文件在仓库中都有一个对应的 RCS 文件, 而且
+ 仓库的目录结构基本上等同于项目的目录结构.</para>
+ <!--
<para>In Subversion, the repository looks like a single
filesystem. Each commit results in an entirely new filesystem
tree; in essence, the repository is an array of trees. Each of
@@ -35,7 +58,14 @@
someone talks about <quote>revision 54</quote>, he's talking
about a particular tree (and indirectly, the way the filesystem
looked after the 54th commit).</para>
+ -->
+ <para>而在 Subversion 中, 仓库看起来像是一个单一的文件系统, 每次提交
+ 都会生成一颗全新的文件系统树, 从本质上讲仓库就是文件系统树组成的数
+ 组. 每一棵文件系统树都由一个单一的版本号进行标记, 当人们在谈论
+ <quote>版本号 54</quote> 时, 其实他们谈论的是一棵特定的文件系统树
+ (或者说在第 54 次提交后的文件系统).</para>
+ <!--
<para>Technically, it's not valid to talk about <quote>revision 5
of <filename>foo.c</filename>.</quote> Instead, one would say
<quote><filename>foo.c</filename> as it appears in revision
@@ -45,7 +75,16 @@
it's most likely that <filename>foo.c</filename> did
<emphasis>not</emphasis> change between revisions 5 and
6.</para>
+ -->
+ <para>从技术上讲, <quote>文件 <filename>foo.c</filename> 的版本号 5</quote>
+ 是不正确的说法, 正确的说法是 <quote>在版本号为 5 时, 文件
+ <filename>foo.c</filename></quote>. 另外, 在假定文件的演变时还要注意,
+ 在 CVS 中, <filename>foo.c</filename> 的版本号 5 和版本号 6 肯定是不同
+ 的, 但是在 Subversion 中, 从版本号 5 到版本号 6,
+ <filename>foo.c</filename> 可能根本 <emphasis>没</emphasis> 发生什么变化.
+ </para>
+ <!--
<para>Similarly, in CVS, a tag or branch is an annotation on the
file or on the version information for that individual file,
whereas in Subversion, a tag or branch is a copy of an entire
@@ -52,6 +91,7 @@
tree (by convention, into the <filename>/branches</filename>
or <filename>/tags</filename> directories that appear at the top
level of the repository, beside <filename>/trunk</filename>). In
+ ### TODO
the repository as a whole, many versions of each file may be
visible: the latest version on each branch, every tagged
version, and of course the latest version on the trunk
@@ -59,9 +99,23 @@
say <quote><filename>foo.c</filename> as it appears in
<filename>/branches/REL1</filename> in revision
5.</quote></para>
+ -->
+ <para>类似的, 在 CVS 中, 标签和目录只不过是文件或文件版本信息上的注释,
+ 而对于 Subversion, 标签和分支是整棵文件系统树的拷贝 (按照惯例, 标签和
+ 分支通常放在仓库顶层目录的 <filename>tags/</filename> 和
+ <filename>branches/</filename> 子目录内, 和 <filename>tags/</filename>,
+ <filename>branches/</filename> 同级的目录还有 <filename>trunk/</filename>).
+ 在整个仓库中, 每个文件的多个版本都是可见的: 每个分支的最新版, 每个标签,
+ 当然还有主干的最新版. 因此, 为了让术语更加准确, 人们经常会说成
+ <quote>在版本号为 5 时, 分支 <filename>branches/REL1</filename> 里的文件
+ <filename>foo.c</filename></quote>.</para>
+ <!--
<para>For more details on this topic, see <xref
linkend="svn.basic.in-action.revs" />.</para>
+ -->
+ <para>关于版本号的更多内容, 见 <xref
+ linkend="svn.basic.in-action.revs" />.</para>
</sect1>
More information about the svnbook-dev
mailing list