[svnbook] r5909 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Fri Apr 5 21:54:00 CDT 2019
Revision: 5909
http://sourceforge.net/p/svnbook/source/5909
Author: wuzhouhui
Date: 2019-04-06 02:53:58 +0000 (Sat, 06 Apr 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-04-01 04:51:38 UTC (rev 5908)
+++ branches/1.8/zh/book/ref-svn.xml 2019-04-06 02:53:58 UTC (rev 5909)
@@ -5117,28 +5117,44 @@
</varlistentry>
<varlistentry>
<term><literal>R</literal></term>
+ <!--
<listitem><para>The item was replaced by a different one
at the same location.</para></listitem>
+ -->
+ <listitem><para>该项被其他项目替换了.</para></listitem>
</varlistentry>
</variablelist>
+ <!--
<para>In addition to the action codes which precede the
changed paths, <command>svn log</command> with
- the <option>--verbose</option> (<option>-v</option>)
+ the <option>- -verbose</option> (<option>-v</option>)
option will note whether a path was added or replaced as
the result of a copy operation. It does so by
printing <literal>(from
<replaceable>COPY-FROM-PATH</replaceable>:<replaceable>COPY-FROM-REV</replaceable>)</literal>
after such paths.</para>
+ -->
+ <para>除了在路径前加上操作码, 添加了选项 <option>--verbose</option>
+ (<option>-v</option>) 的 <command>svn log</command> 还会注释路径
+ 是否是通过复制得到的, 注释的形式是在路径后加上 <literal>(from
+ <replaceable>COPY-FROM-PATH</replaceable>:<replaceable>COPY-FROM-REV</replaceable>)</literal>.</para>
+ <!--
<para>When you're concatenating the results of multiple
calls to the log command, you may want to use the
- <option>--incremental</option> option. <command>svn
+ <option>- -incremental</option> option. <command>svn
log</command> normally prints out a dashed line at the
beginning of a log message, after each subsequent log
message, and following the final log message. If you
ran <command>svn log</command> on a range of two
revisions, you would get this:</para>
+ -->
+ <para>如果你想串联多个 <command>svn log</command> 的执行结果, 那你可能
+ 需要选项 <option>--incremental</option>. <command>svn log</command>
+ 通常会在开始打印日志消息之前, 在打印完一条日志消息之后, 以及打印完最
+ 后一条日志消息之后打印一行连字符. 如果你用 <command>svn log</command>
+ 查询一段版本号范围内的日志, 你将会得到:</para>
<informalexample>
<screen>
@@ -5153,9 +5169,13 @@
</screen>
</informalexample>
+ <!--
<para>However, if you wanted to gather two nonsequential log
messages into a file, you might do something like
this:</para>
+ -->
+ <para>然而, 如果你想把多个不连续的日志消息写到一个文件中, 你可能会这
+ 样做:</para>
<informalexample>
<screen>
@@ -5178,9 +5198,13 @@
</screen>
</informalexample>
+ <!--
<para>You can avoid the clutter of the double dashed lines
- in your output by using the <option>--incremental</option>
+ in your output by using the <option>- -incremental</option>
option:</para>
+ -->
+ <para>为了避免出现凌乱的双条连字符行, 可以为 <command>svn log</command>
+ 加上选项 <option>--incremental</option>:</para>
<informalexample>
<screen>
@@ -5199,9 +5223,13 @@
</screen>
</informalexample>
- <para>The <option>--incremental</option> option provides
+ <!--
+ <para>The <option>- -incremental</option> option provides
similar output control when using the
- <option>--xml</option> option:</para>
+ <option>- -xml</option> option:</para>
+ -->
+ <para>如果已经添加了选项 <option>--xml</option>, 再加上选项
+ <option>--incremental</option> 后能提供类似的输出控制:</para>
<informalexample>
<screen>
@@ -5216,9 +5244,13 @@
</informalexample>
<tip>
+ <!--
<para>Sometimes when you run <command>svn log</command> on
a specific path and a specific revision, you see no log
information output at all, as in the following:</para>
+ -->
+ <para>有时候, 如果你用 <command>svn log</command> 查询某个路径在
+ 特定版本号上的历史, 你可能看不到任何日志被打印出来, 例如:</para>
<informalexample>
<screen>
@@ -5227,11 +5259,16 @@
</screen>
</informalexample>
+ <!--
<para>That just means the path wasn't modified in that
revision. To get log information for that revision,
either run the log operation against the repository's
root URL, or specify a path that you happen to know was
changed in that revision:</para>
+ -->
+ <para>这仅仅意味着该路径在该版本号上没有发生任何修改. 为了得到该版本
+ 号的日志消息, 要么把仓库的根目录 URL 作为目标, 要么你很清楚该版本
+ 号修改了哪个路径, 并把它作为目标:</para>
<informalexample>
<screen>
@@ -5245,6 +5282,7 @@
</informalexample>
</tip>
+ <!--
<para>Beginning with Subversion 1.7, users can take
advantage of a special output mode which combines the
information from <command>svn log</command> with what you
@@ -5251,8 +5289,13 @@
would see when running <command>svn diff</command> on the
same targets for each revision of the log. Simply
invoke <command>svn log</command> with
- the <option>--diff</option> option to trigger this output
+ the <option>- -diff</option> option to trigger this output
mode.</para>
+ -->
+ <para>从 Subversion 1.7 开始, <command>svn log</command> 支持一种特殊
+ 的输出模式, 该模式和 <command>svn diff</command> 一样能够把修改以
+ 标准差异格式输出, 方法就是为 <command>svn log</command> 加上选项
+ <option>--diff</option>:</para>
<informalexample>
<screen>
@@ -5274,24 +5317,42 @@
</screen>
</informalexample>
+ <!--
<para>As with <command>svn diff</command>, you may also make
use of many of the various options which control the way
the difference is generated,
- including <option>--depth</option>, <option>--diff-cmd</option>,
- and <option>--extensions</option>
+ including <option>- -depth</option>, <option>- -diff-cmd</option>,
+ and <option>- -extensions</option>
(<option>-x</option>).</para>
+ -->
+ <para>和 <command>svn diff</command> 一样, 用户可以利用选项
+ <option>--depth</option>, <option>--diff-cmd</option> 和
+ <option>--extensions</option> (<option>-x</option>) 控制差异比较的
+ 具体行为.</para>
+ <!--
<para>Beginning with Subversion 1.8, users can filter <command>svn log</command>
- output using <option>--search</option> and <option>--search-and</option>
+ output using <option>- -search</option> and <option>- -search-and</option>
options. When using these options, a log message is shown only if a
revision's author, date, log message text, or list of changed paths,
matches a search pattern. Searching by changed patch requires
- <option>--verbose</option> option, otherwise <command>svn log</command>
+ <option>- -verbose</option> option, otherwise <command>svn log</command>
does not show changed paths therefore they can't be filtered.</para>
+ -->
+ <para>从 Subversion 1.8 开始, 用户可以用选项 <option>--search</option>
+ 和 <option>--search-and</option> 过滤 <command>svn log</command> 的
+ 输出. 如果在命令中用到了这两个选项, 那么仅当版本号的作者, 提交日期,
+ 日志消息内容或被修改的路径和模式匹配时, 日志消息才会被打印出来. 在
+ 匹配被修改的路径时, 还要求加上选项 <option>--verbose</option>, 否则
+ 的话 <command>svn log</command> 不会去匹配被修改的路径.</para>
+ <!--
<para>The search pattern (also called glob or shell wildcard
pattern) can contain regular characters and the following
wildcard characters:</para>
+ -->
+ <para>搜索模式 (也被称作文本表达式或 Shell 通配符模式) 可以包含普通
+ 字符和下面的通配符:</para>
<variablelist>
<varlistentry>
@@ -5299,7 +5360,10 @@
<literal>?</literal>
</term>
<listitem>
+ <!--
<para>Matches any single character.</para>
+ -->
+ <para>匹配任意一个字符.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -5307,7 +5371,10 @@
<literal>*</literal>
</term>
<listitem>
+ <!--
<para>Matches a sequence of arbitrary characters.</para>
+ -->
+ <para>匹配任意一个字符序列.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -5315,15 +5382,22 @@
<literal>[ABC]</literal>
</term>
<listitem>
+ <!--
<para>Matches any of the characters listed inside the
brackets.</para>
+ -->
+ <para>匹配中括号内的任意一个字符.</para>
</listitem>
</varlistentry>
</variablelist>
- <para>Using multiple <option>--search</option> parameters will show
+ <!--
+ <para>Using multiple <option>- -search</option> parameters will show
log messages that match the pattern specified at least in one of the
options. For example:</para>
+ -->
+ <para>如果选项 <option>--search</option> 出现了多次, 那么只要任意一个
+ 模式得到匹配, 日志消息就会被打印, 例如:</para>
<informalexample>
<screen>
$ svn log --search sally --search harry https://svn.red-bean.com/repos/test
@@ -5339,10 +5413,15 @@
$
</screen>
</informalexample>
+ <!--
<para>
- Using <option>--search</option> with <option>--search-and</option> options will show log messages
+ Using <option>- -search</option> with <option>- -search-and</option> options will show log messages
that match the combined pattern from both options. For example:
</para>
+ -->
+ <para>如果选项 <option>--search</option> 和
+ <option>--search-and</option> 一起使用, 则只有同时匹配所有模式的
+ 日志消息才会被打印, 例如:</para>
<informalexample>
<screen>
$ svn log --verbose --search sally --search-and /foo/bar https://svn.red-bean.com/repos/test
@@ -5364,15 +5443,21 @@
</screen>
</informalexample>
<tip>
+ <!--
<para>
- <option>--search</option> and <option>--search-and</option>
+ <option>- -search</option> and <option>- -search-and</option>
options does not actually perform a search. They just filter
the <command>svn log</command> output to display only log
messages that match the specified pattern. Therefore, if
- <option>--limit</option> is used, it restricts the number
+ <option>- -limit</option> is used, it restricts the number
of log messages searched, rather than restricting the
output to a particular number of matching log messages.
</para>
+ -->
+ <para>选项 <option>--search</option> 和 <option>--search-and</option>
+ 实际上并没有执行搜索, 它们仅仅是过滤 <command>svn log</command> 的
+ 输出. 因此, 如果还使用了选项 <option>--limit</option>, 它将会限制
+ 过滤前的日志消息数量, 而不是限制已过滤的日志消息数量.</para>
</tip>
</refsect1>
</refentry>
@@ -5390,8 +5475,11 @@
<refnamediv>
<refname>svn merge</refname>
+ <!--
<refpurpose>Apply the differences between two sources to a
working copy path.</refpurpose>
+ -->
+ <refpurpose>把两个源的差异应用到工作副本上.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -5402,8 +5490,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>In all three forms
<replaceable>TARGET_WCPATH</replaceable> is
the working copy path that will receive the differences. If
@@ -5413,7 +5505,14 @@
file within the current working directory. In
that case, the differences will be applied to that
file.</para>
+ -->
+ <para>在上面的三种形式中, <replaceable>TARGET_WCPATH</replaceable>
+ 都是一个接收差异的工作副本路径. 如果省略了
+ <replaceable>TARGET_WCPATH</replaceable>, 接收差异的将是当前工作目录,
+ 如果源的最后一个分量和当前工作目录内的某个文件名相同, 则接收差异的将
+ 会是这个文件.</para>
+ <!--
<para>In the first two forms, <replaceable>SOURCE</replaceable>
can be either a URL or a working copy path (in which case its
corresponding URL is used). If the peg revision
@@ -5426,10 +5525,24 @@
with the only difference being that if either source is a
working copy path, then the peg revisions
<emphasis>must</emphasis> be explicitly stated.</para>
+ -->
+ <para>在前两种形式中, <replaceable>SOURCE</replaceable> 是一个 URL 或
+ 工作副本路径 (此时 Subversion 将自动使用工作副本路径对应的 URL).
+ 如果没有指定限定版本号 <replaceable>REV</replaceable>, 就默认使用
+ <literal>HEAD</literal>. 对于第三种形式, 相同的规则同样适用于
+ <replaceable>SOURCE1</replaceable>, <replaceable>SOURCE2</replaceable>,
+ <replaceable>M</replaceable> 和 <replaceable>N</replaceable>, 唯一的
+ 不同点是如果 <replaceable>SOURCE1</replaceable> 或
+ <replaceable>SOURCE2</replaceable> 是一个工作副本路径, 则必须
+ <emphasis>显式地</emphasis> 指定限定版本号.</para>
<itemizedlist>
<listitem>
+ <!--
<para>Automatic Merges</para>
+ -->
+ <para>自动合并</para>
+ <!--
<para>The first form is called an <quote>automatic
merge</quote> and is used to perform <quote>sync</quote>
and <quote>reintegrate</quote> merges.
@@ -5450,9 +5563,29 @@
and
<xref linkend="svn.branchmerge.commonpatterns.feature"/>.
</para>
+ -->
+ <para>第一种形式称为 <quote>自动合并</quote>, 它用于执行
+ <quote>同步</quote> 合并和 <quote>再整合</quote> 合并.
+ <quote>同步</quote> 合并把祖先分支
+ (<replaceable>SOURCE</replaceable>) 中可以合并的修改合并到
+ 目标分支 (<replaceable>TARGET_WCPATH</replaceable>) 上.
+ <quote>可以合并的</quote> 修改指的是那些还没有从
+ <replaceable>SOURCE</replaceable> 合并到
+ <replaceable>TARGET_WCPATH</replaceable> 的修改, 见
+ <xref linkend="svn.branchmerge.basicmerging.stayinsync"/>.
+ <quote>再整合</quote> 合并是把特性分支的修改
+ (<replaceable>SOURCE</replaceable>) 合并到祖先分支
+ (<replaceable>TARGET_WCPATH</replaceable>) 上, 见
+ <xref linkend="svn.branchmerge.basicmerging.reintegrate"/> 和
+ <xref linkend="svn.branchmerge.commonpatterns.feature"/>.</para>
+
</listitem>
<listitem>
+ <!--
<para>Cherrypick Merges</para>
+ -->
+ <para>精选合并</para>
+ <!--
<para>The second form is called a <quote>cherry-pick</quote>
merge and is used to merge an explicitly defined set of
changes from one branch to another.
@@ -5463,7 +5596,15 @@
provided. See
<xref linkend="svn.branchmerge.cherrypicking"/> for more
information.</para>
+ -->
+ <para>第二种形式称为 <quote>精选</quote> 合并, 用于合并特定的修改,
+ 修改来自 <replaceable>SOURCE</replaceable> (限定版本号为
+ <replaceable>REV</replaceable>) 的版本号
+ <replaceable>N</replaceable> 和 <replaceable>M</replaceable> 的
+ 比较. 更多的信息见 <xref
+ linkend="svn.branchmerge.cherrypicking"/>.</para>
<tip>
+ <!--
<para>Multiple <literal>-c</literal> and/or
<literal>-r</literal> instances may be specified, and
mixing of forward and reverse ranges is allowed—
@@ -5471,10 +5612,19 @@
representation before merging begins (which may result
in a no-op merge or conflicts that cause the merge to
stop before merging all of the requested revisions).</para>
+ -->
+ <para><literal>-c</literal> 或 <literal>-r</literal> 可以出现多次,
+ 也可以混合正向和反向的版本号范围—在合并开始前, Subversion
+ 自动地把版本号范围压缩成最简的表示形式 (这可能会导致空合并或
+ 冲突, 从而导致合并中止).</para>
</tip>
</listitem>
<listitem>
+ <!--
<para>2-URL Merges</para>
+ -->
+ <para>二路 URL 合并</para>
+ <!--
<para>In the third form, called a <quote>2-URL Merge</quote>,
the difference between <replaceable>SOURCE1</replaceable>
at revision <replaceable>N</replaceable> and
@@ -5482,6 +5632,13 @@
<replaceable>M</replaceable> is generated and applied to
<replaceable>TARGET_WCPATH</replaceable>. The revisions
default to <literal>HEAD</literal> if omitted.</para>
+ -->
+ <para>第三种形式称为 <quote>二路 URL 合并</quote>, 限定版本号为
+ <replaceable>N</replaceable> 的 <replaceable>SOURCE1</replaceable>
+ 和限定版本号为 <replaceable>M</replaceable> 的
+ <replaceable>SOURCE2</replaceable> 之间的差异将被应用到
+ <replaceable>TARGET_WCPATH</replaceable> 上. 如果省略了限定版本号,
+ 则使用 <literal>HEAD</literal>.</para>
</listitem>
</itemizedlist>
More information about the svnbook-dev
mailing list