[svnbook] r5895 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Mar 2 07:17:05 CST 2019
Revision: 5895
http://sourceforge.net/p/svnbook/source/5895
Author: wuzhouhui
Date: 2019-03-02 13:17:04 +0000 (Sat, 02 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-02 11:29:01 UTC (rev 5894)
+++ branches/1.8/zh/book/ref-svn.xml 2019-03-02 13:17:04 UTC (rev 5895)
@@ -1121,6 +1121,7 @@
<varlistentry id="svn.ref.svn.sw.parents">
<term><option>--parents</option></term>
<listitem>
+ <!--
<para>Creates and adds nonexistent or nonversioned parent
directories to the working copy or repository as part
of an operation. This is useful for automatically
@@ -1127,6 +1128,10 @@
creating multiple subdirectories where none currently
exist. If performed on a URL, all the directories will
be created in a single commit.</para>
+ -->
+ <para>作为操作的一部分, 在工作副本或仓库中自动创建不存在的父目录.
+ 这个选项对于自动创建多级子目录非常方便, 如果目标是一个 URL, 那么
+ 所有的目录都会在一个提交中创建完成.</para>
</listitem>
</varlistentry>
@@ -1133,14 +1138,21 @@
<varlistentry id="svn.ref.svn.sw.password">
<term><option>--password</option> <replaceable>PASSWD</replaceable></term>
<listitem>
+ <!--
<para>Specifies the password to use when authenticating
against a Subversion server. If not provided, or if
incorrect, Subversion will prompt you for this
information as needed.</para>
+ -->
+ <para>指定用于 Subversion 服务器认证的密码. 如果没有在命令行上指定
+ 密码, 或者密码有误, 在需要时 Subversion 将提示用户输入密码.</para>
<note>
+ <!--
<para>This option is accepted by
all <command>svn</command> subcommands.</para>
+ -->
+ <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
</note>
</listitem>
</varlistentry>
@@ -1148,11 +1160,16 @@
<varlistentry id="svn.ref.svn.sw.patch_compatible">
<term><option>--patch-compatible</option></term>
<listitem>
+ <!--
<para>Instructs <command>svn diff</command> to produce output
compatible with generic third-party patch tools. The result of
using this option is the same as running <command>svn diff</command>
- with <option>--show-copies-as-adds --ignore-properties</option>
+ with <option>- -show-copies-as-adds - -ignore-properties</option>
options.</para>
+ -->
+ <para>告诉 <command>svn diff</command> 的输出要和通用的第三方补丁
+ 工具保持兼容. 该选项等价于 <option>--show-copies-as-adds
+ --ignore-properties</option>.</para>
</listitem>
</varlistentry>
@@ -1159,8 +1176,11 @@
<varlistentry id="svn.ref.svn.sw.properties_only">
<term><option>--properties-only</option></term>
<listitem>
+ <!--
<para>Instructs <command>svn diff</command> to show only property
changes.</para>
+ -->
+ <para>告诉 <command>svn diff</command> 只输出属性上的变化.</para>
</listitem>
</varlistentry>
@@ -1167,8 +1187,11 @@
<varlistentry id="svn.ref.svn.sw.quiet">
<term><option>--quiet</option> (<option>-q</option>)</term>
<listitem>
+ <!--
<para>Requests that the client print only essential
information while performing an operation.</para>
+ -->
+ <para>告诉 <command>svn</command> 在执行时只打印必要的信息.</para>
</listitem>
</varlistentry>
@@ -1175,10 +1198,14 @@
<varlistentry id="svn.ref.svn.sw.record_only">
<term><option>--record-only</option></term>
<listitem>
+ <!--
<para>Enables a special mode of <command>svn
merge</command> in which the specified merge operation is
recorded in the local merge tracking information, but is
not actually performed.</para>
+ -->
+ <para>告诉 <command>svn merge</command> 只合并合并信息, 不合并文件
+ 上的修改.</para>
</listitem>
</varlistentry>
@@ -1185,8 +1212,12 @@
<varlistentry id="svn.ref.svn.sw.recursive">
<term><option>--recursive</option> (<option>-R</option>)</term>
<listitem>
+ <!--
<para>Makes a subcommand recurse into subdirectories.
(Most subcommands recurse by default.)</para>
+ -->
+ <para>告诉子命令要递归地执行到子目录内 (大多数子命令都会默认递归
+ 执行).</para>
</listitem>
</varlistentry>
@@ -1193,6 +1224,7 @@
<varlistentry id="svn.ref.svn.sw.reintegrate">
<term><option>--reintegrate</option></term>
<listitem>
+ <!--
<para>Deprecated. Used with the <command>svn merge</command>
subcommand to merge changes from a feature branch back into
the feature branch's ancestor branch. Since Subversion 1.8
@@ -1201,6 +1233,12 @@
See
<xref linkend="svn.branchmerge.basicmerging.reintegrate"/>
for details.</para>
+ -->
+ <para>不再推荐使用该选项. 该选项用于 <command>svn merge</command>
+ 把特性分支上的修改合并到特性分支的祖先分支上. 从 Subversion 1.8
+ 开始, <command>svn merge</command> 能够自动检测这种合并场景并执行
+ 恰当的合并操作, 更多的细节见
+ <xref linkend="svn.branchmerge.basicmerging.reintegrate"/>.</para>
</listitem>
</varlistentry>
@@ -1207,6 +1245,7 @@
<varlistentry id="svn.ref.svn.sw.relocate">
<term><option>--relocate</option></term>
<listitem>
+ <!--
<para>Deprecated. When used with the <command>svn
switch</command> subcommand, changes the location of the
repository that your working copy references. The
@@ -1214,6 +1253,11 @@
use the <command>svn relocate</command> subcommand. See
<xref linkend="svn.ref.svn.c.relocate" /> for more
details and an example.</para>
+ -->
+ <para>不再推荐使用该选项. 该选项用于 <command>svn switch</command>
+ 改变工作副本所指向的仓库位置, 从 Subversion 1.7 开始, 更好的做法
+ 是用命令 <command>svn relocate</command>, 更多的细节和示例见
+ <xref linkend="svn.ref.svn.c.relocate" />.</para>
</listitem>
</varlistentry>
@@ -1220,10 +1264,14 @@
<varlistentry id="svn.ref.svn.sw.remove">
<term><option>--remove</option></term>
<listitem>
+ <!--
<para>Used with <command>svn changelist</command> to
disassociate—rather than associate (which is the
default operation)—the target(s) from a
changelist.</para>
+ -->
+ <para>用于 <command>svn changelist</command> 解除—而不是建立
+ (默认行为)—文件与变更列表之间的关联.</para>
</listitem>
</varlistentry>
@@ -1230,9 +1278,13 @@
<varlistentry id="svn.ref.svn.sw.reverse_diff">
<term><option>--reverse-diff</option></term>
<listitem>
+ <!--
<para>Causes <command>svn patch</command> to interpret the
input patch instructions in reverse—treating added
lines as removed ones and vice-versa.</para>
+ -->
+ <para>告诉 <command>svn patch</command> 反向应用补丁—把新增
+ 的行看成是被删除的行, 把删除的行看成是新增的行.</para>
</listitem>
</varlistentry>
@@ -1239,6 +1291,7 @@
<varlistentry id="svn.ref.svn.sw.revision">
<term><option>--revision</option> (<option>-r</option>) <replaceable>REV</replaceable></term>
<listitem>
+ <!--
<para>Specifies a revision (or range of revisions) on with
which to operate. You can provide revision numbers,
keywords, or dates (in curly braces) as arguments to the
@@ -1245,6 +1298,10 @@
revision option. If you wish to offer a range of
revisions, you can provide two revisions separated by a
colon. For example:</para>
+ -->
+ <para>指定待操作的版本号 (或版本号范围). 该选项接受的参数有整数,
+ 关键字或日期 (日期被花括号包围). 如果你希望指定一个版本号范围,
+ 就在起始版本号与终止版本号之间加个冒号, 例如:</para>
<informalexample>
<screen>
@@ -1256,8 +1313,11 @@
</screen>
</informalexample>
+ <!--
<para>See <xref linkend="svn.tour.revs.keywords"/> for more
information.</para>
+ -->
+ <para>更多的信息见 <xref linkend="svn.tour.revs.keywords"/>.</para>
</listitem>
</varlistentry>
@@ -1264,11 +1324,16 @@
<varlistentry id="svn.ref.svn.sw.revprop">
<term><option>--revprop</option></term>
<listitem>
+ <!--
<para>Operates on a revision property instead of a
property specific to a file or directory. This option
requires that you also pass a revision with the
- <option>--revision</option> (<option>-r</option>)
+ <option>- -revision</option> (<option>-r</option>)
option.</para>
+ -->
+ <para>针对版本号属性 (而不是文件或目录上的属性) 进行操作, 该选项
+ 还要求你同时用选项 <option>--revision</option>
+ (<option>-r</option>) 指定了一个版本号.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list