[svnbook] r6030 committed - branches/1.8/zh/book
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sun Feb 23 02:19:49 UTC 2020
Revision: 6030
http://sourceforge.net/p/svnbook/source/6030
Author: wuzhouhui
Date: 2020-02-23 02:19:49 +0000 (Sun, 23 Feb 2020)
Log Message:
-----------
1.8/zh: resolve some TODO
Modified Paths:
--------------
branches/1.8/zh/book/appb-svn-for-cvs-users.xml
branches/1.8/zh/book/ch05-repository-admin.xml
branches/1.8/zh/book/ref-svn.xml
branches/1.8/zh/book/ref-svnrdump.xml
Modified: branches/1.8/zh/book/appb-svn-for-cvs-users.xml
===================================================================
--- branches/1.8/zh/book/appb-svn-for-cvs-users.xml 2020-02-16 02:31:05 UTC (rev 6029)
+++ branches/1.8/zh/book/appb-svn-for-cvs-users.xml 2020-02-23 02:19:49 UTC (rev 6030)
@@ -193,7 +193,6 @@
to say that we still have revision 5 of
<filename>foo</filename>. However, if we bumped
<filename>foo</filename>'s revision number after the commit,
- ### TODO
that would be a lie too; there may be other changes to
<filename>foo</filename> we haven't yet received, because we
haven't updated yet.</para>
@@ -202,8 +201,8 @@
5</quote> 的涵义定义成目录项和属性的特定集合. 现在假设我们从目录
<filename>foo</filename> 里添加并删除了一些文件, 然后提交, 这时候
如果再说 <quote>我们仍然拥有目录 <filename>foo</filename>
- 的版本号 5</quote> 是不对的. 再者, 如果我们在提交后更新了目录
- <filename>foo</filename> 的版本号, 这时候再说 <quote>我们
+ 的版本号 5</quote> 是不对的. 再者, 如果我们在提交后更新了目录 (仅
+ 目录) <filename>foo</filename> 的版本号, 这时候再说 <quote>我们
仍然拥有目录 <filename>foo</filename> 的版本号 5</quote> 还是不对,
因为目录中可能还有其他一些文件的更新还没有收到.</para>
Modified: branches/1.8/zh/book/ch05-repository-admin.xml
===================================================================
--- branches/1.8/zh/book/ch05-repository-admin.xml 2020-02-16 02:31:05 UTC (rev 6029)
+++ branches/1.8/zh/book/ch05-repository-admin.xml 2020-02-23 02:19:49 UTC (rev 6030)
@@ -2973,7 +2973,6 @@
repository, <command>svnadmin</command> will compare the first
dumped revision against the previous revision in the
repository—the same way it treats every other revision that
- ### TODO
gets dumped. It will then output the first revision exactly
as it does the rest of the revisions in the dump
range—mentioning only the changes that occurred in that
@@ -2983,7 +2982,7 @@
-->
<para>然而, 管理员可以修改这种默认行为. 如果在转储时添加了选项
<option>--incremental</option>, <command>svnadmin</command> 会把
- 转储的第一个版本号与前一个版本号作比较—就像对待其他被转储的
+ 转储的第一个版本号与前一个版本号作比较, 跟转储范围中剩下的其他
版本号那样, 只输出在版本号中被修改了的内容. 这样做的好处是管理员
可以创建出几个较小的转储文件—而不是一整个大文件—它们被
加载时可以连续进行, 就像下面这样:</para>
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml 2020-02-16 02:31:05 UTC (rev 6029)
+++ branches/1.8/zh/book/ref-svn.xml 2020-02-23 02:19:49 UTC (rev 6030)
@@ -1791,7 +1791,6 @@
<title>描述</title>
<!--
- ### TODO
<para>Schedule files, directories, or symbolic links in your
working copy for addition to the repository. They will be
uploaded and added to the repository on your next commit.
Modified: branches/1.8/zh/book/ref-svnrdump.xml
===================================================================
--- branches/1.8/zh/book/ref-svnrdump.xml 2020-02-16 02:31:05 UTC (rev 6029)
+++ branches/1.8/zh/book/ref-svnrdump.xml 2020-02-23 02:19:49 UTC (rev 6030)
@@ -94,7 +94,6 @@
<term><option>--incremental</option></term>
<listitem>
<!--
- ### TODO
<para>Dump a revision or revision range only as a diff
against the previous revision, instead of the default,
which is begin a dumped revision range with a complete
@@ -101,7 +100,9 @@
expansion of all contents of the repository as of that
revision.</para>
-->
- <para>按照增量格式转储版本号.</para>
+ <para>在转储版本号或版本号范围时, 对范围中的第一个版本号按照增量
+ 格式进行转储, 而不是默认行为—转储第一个版本号的完整内容.
+ </para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list