[svnbook] r5905 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Mar 23 22:10:08 CDT 2019
Revision: 5905
http://sourceforge.net/p/svnbook/source/5905
Author: wuzhouhui
Date: 2019-03-24 03:10:06 +0000 (Sun, 24 Mar 2019)
Log Message:
-----------
1.8/zh: translation of svn reference in progress
Modified Paths:
--------------
branches/1.8/zh/book/ref-svn.xml
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml 2019-03-23 04:02:24 UTC (rev 5904)
+++ branches/1.8/zh/book/ref-svn.xml 2019-03-24 03:10:06 UTC (rev 5905)
@@ -3660,6 +3660,7 @@
</variablelist>
+ <!--
<para>If the alternate syntax is used, the server compares
<replaceable>URL1</replaceable> and
<replaceable>URL2</replaceable> at revisions
@@ -3668,22 +3669,39 @@
<replaceable>N</replaceable> or
<replaceable>M</replaceable> is omitted, a value of
<literal>HEAD</literal> is assumed.</para>
+ -->
+ <para>如果使用了替代语法, 服务器将比较分别处于版本号
+ <replaceable>N</replaceable> 和 <replaceable>M</replaceable>
+ 的 <replaceable>URL1</replaceable> 和 <replaceable>URL2</replaceable>.
+ 如果没有指定了 <replaceable>N</replaceable> 或
+ <replaceable>M</replaceable>, 将默认使用 <literal>HEAD</literal>.
+ </para>
+ <!--
<para>By default, <command>svn diff</command> ignores the
ancestry of files and merely compares the contents of the
two files being compared. If you use
- <option>--notice-ancestry</option>, the ancestry of the
+ <option>- -notice-ancestry</option>, the ancestry of the
paths in question will be taken into consideration when
comparing revisions (i.e., if you run <command>svn
diff</command> on two files with identical contents but
different ancestry, you will see the entire contents of
the file as having been removed and added again).</para>
+ -->
+ <para>默认情况下, <command>svn diff</command> 会忽略文件的祖先, 而只
+ 比较文件的内容. 如果使用了选项 <option>--notice-ancestry</option>,
+ 那么在比较版本号时就是考虑相关路径的祖先 (也就是说,如果你用
+ <command>svn diff</command> 比较了两个内容相同, 但祖先不同的文件, 你
+ 将会看到文件的整个内容曾经被删除, 然后又被添加).</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -3713,11 +3731,18 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Compare <literal>BASE</literal> and your working copy
(one of the most popular uses of <command>svn
diff</command>):</para>
+ -->
+ <para>比较 <literal>BASE</literal> 与工作副本 (<command>svn diff</command>
+ 最常见的用途之一):</para>
<informalexample>
<screen>
@@ -3730,8 +3755,12 @@
</screen>
</informalexample>
+ <!--
<para>See what changed in the file
<filename>COMMITTERS</filename> revision 9115:</para>
+ -->
+ <para>查看 <filename>COMMITTERS</filename> 在版本号 9115 发生了哪些
+ 变化:</para>
<informalexample>
<screen>
@@ -3745,8 +3774,11 @@
</informalexample>
+ <!--
<para>See how your working copy's modifications compare
against an older revision:</para>
+ -->
+ <para>比较工作副本和更老的版本号:</para>
<informalexample>
<screen>
@@ -3759,8 +3791,11 @@
</screen>
</informalexample>
+ <!--
<para>Compare revision 3000 to revision 3500 using <quote>@</quote>
syntax:</para>
+ -->
+ <para>使用 <quote>@</quote> 语法比较版本号 3000 和 3500:</para>
<informalexample>
<screen>
@@ -3774,9 +3809,13 @@
</screen>
</informalexample>
+ <!--
<para>Compare revision 3000 to revision 3500 using range
notation (pass only the one URL in this
case):</para>
+ -->
+ <para>使用范围记号比较版本号 3000 与 3500 (这时候只需要一个 URL 参数):
+ </para>
<informalexample>
<screen>
@@ -3790,8 +3829,12 @@
</informalexample>
+ <!--
<para>Compare revision 3000 to revision 3500 of all the files in
<filename>trunk</filename> using range notation:</para>
+ -->
+ <para>使用范围记号比较 <filename>trunk</filename> 内的所有文件在
+ 版本号 3000 到 3500 之间的变化:</para>
<informalexample>
<screen>
@@ -3800,9 +3843,13 @@
</informalexample>
+ <!--
<para>Compare revision 3000 to revision 3500 of only three
files in <filename>trunk</filename> using range
notation:</para>
+ -->
+ <para>使用范围记号比较 <filename>trunk</filename> 内的三个文件在版本
+ 号 3000 到 3500 之间的变化:</para>
<informalexample>
<screen>
@@ -3811,8 +3858,11 @@
</screen>
</informalexample>
+ <!--
<para>If you have a working copy, you can obtain the
differences without typing in the long URLs:</para>
+ -->
+ <para>如果你已经有了一个工作副本, 就不用再输入冗长的 URL:</para>
<informalexample>
<screen>
@@ -3825,10 +3875,15 @@
</screen>
</informalexample>
- <para>Use <option>--diff-cmd</option>
- <replaceable>CMD</replaceable> <option>--extensions</option>
+ <!--
+ <para>Use <option>- -diff-cmd</option>
+ <replaceable>CMD</replaceable> <option>- -extensions</option>
(<option>-x</option>) to pass arguments directly to the
external diff program:</para>
+ -->
+ <para>使用选项 <option>--diff-cmd</option> <replaceable>CMD</replaceable>
+ <option>--extensions</option> (<option>-x</option>) 向外部差异比较
+ 工具传递参数:</para>
<informalexample>
<screen>
@@ -3842,10 +3897,15 @@
</screen>
</informalexample>
- <para>Lastly, you can use the <option>--xml</option> option
- along with the <option>--summarize</option> option to view
+ <!--
+ <para>Lastly, you can use the <option>- -xml</option> option
+ along with the <option>- -summarize</option> option to view
XML describing the changes that occurred between
revisions, but not the contents of the diff itself:</para>
+ -->
+ <para>最后, 可以同时使用选项 <option>--xml</option> 和
+ <option>--summarize</option> 查看修改的 XML 描述, 修改的具体内容不
+ 会显示出来:</para>
<informalexample>
<screen>
@@ -3887,7 +3947,10 @@
<refnamediv>
<refname>svn export</refname>
+ <!--
<refpurpose>Export a clean directory tree.</refpurpose>
+ -->
+ <refpurpose>导出一个干净的目录树.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -3897,8 +3960,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>The first form exports a clean directory tree from the
repository specified by <replaceable>URL</replaceable>—at revision
<replaceable>REV</replaceable> if it is given; otherwise,
@@ -3907,7 +3974,16 @@
<replaceable>PATH</replaceable> is omitted, the last
component of the <replaceable>URL</replaceable> is used
for the local directory name.</para>
+ -->
+ <para>命令的第一种形式从 <replaceable>URL</replaceable> 所指定的仓库
+ 导出一个干净的目录树到 <replaceable>PATH</replaceable>. 如果指定了
+ <replaceable>REV</replaceable>, 将导出仓库在版本号
+ <replaceable>REV</replaceable> 时的目录树, 否则的话版本号默认就是
+ <literal>HEAD</literal>. 如果省略 <replaceable>PATH</replaceable>,
+ 那么 <replaceable>URL</replaceable> 的最后一个分量将作为导出后的
+ 目录名.</para>
+ <!--
<para>The second form exports a clean directory tree from
the working copy specified by
<replaceable>PATH1</replaceable> into
@@ -3914,11 +3990,18 @@
<replaceable>PATH2</replaceable>. All local changes will
be preserved, but files not under version control will not
be copied.</para>
+ -->
+ <para>命令的第二种形式从 <replaceable>PATH1</replaceable> 指定的工作
+ 副本导出一个干净的目录树到 <replaceable>PATH2</replaceable>. 所有的
+ 本地修改都会保留在导出的目录中, 但不包括不被版本控制的文件.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -3935,10 +4018,16 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Export from your working copy (doesn't print every
file and directory):</para>
+ -->
+ <para>从工作副本导出 (被导出的文件或目录的名字不会打印出来):</para>
<informalexample>
<screen>
@@ -3947,8 +4036,11 @@
</screen>
</informalexample>
+ <!--
<para>Export directly from the repository (prints every
file and directory):</para>
+ -->
+ <para>从仓库导出 (被导出的每一个文件或目录的名字都会打印出来):</para>
<informalexample>
<screen>
@@ -3960,15 +4052,22 @@
</screen>
</informalexample>
+ <!--
<para>When rolling operating-system-specific release
packages, it can be useful to export a tree that uses a
specific EOL character for line endings. The
- <option>--native-eol</option> option will do this, but it
+ <option>- -native-eol</option> option will do this, but it
affects only files that have <literal>svn:eol-style =
native</literal> properties attached to them. For
example, to export a tree with all CRLF line endings
(possibly for a Windows <filename>.zip</filename> file
distribution):</para>
+ -->
+ <para>在制作特定于操作系统的发行包时, 如果能为导出的目录树指定特定的
+ EOL, 那将会非常方便, 选项 <option>--native-eol</option> 就是用于这
+ 个目的, 但是它只会影响设置了属性
+ <literal>svn:eol-style=native</literal> 的文件. 例如, 为 Windows
+ 导出以 CRLF 作为 EOL 的目录树:</para>
<informalexample>
<screen>
@@ -3980,10 +4079,15 @@
</screen>
</informalexample>
+ <!--
<para>You can specify <literal>LR</literal>,
<literal>CR</literal>, or <literal>CRLF</literal> as a
- line-ending type with the <option>--native-eol</option>
+ line-ending type with the <option>- -native-eol</option>
option.</para>
+ -->
+ <para>选项 <option>--native-eol</option> 接受的参数有
+ <literal>LR</literal>, <literal>CR</literal> 和
+ <literal>CRLF</literal>.</para>
</refsect1>
</refentry>
@@ -4001,7 +4105,10 @@
<refnamediv>
<refname>svn help (h, ?)</refname>
+ <!--
<refpurpose>Help!</refpurpose>
+ -->
+ <refpurpose>帮助!</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -4010,17 +4117,30 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>This is your best friend when you're using
Subversion and this book isn't within reach!</para>
+ -->
+ <para>如果你无法获取这本书, 那么这个命令就是你使用 Subversion
+ 的最好帮手!</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
+ <!--
<para>None</para>
+ -->
+ <para>没有选项</para>
</refsect1>
</refentry>
More information about the svnbook-dev
mailing list