[svnbook] r5911 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sun Apr 14 06:41:51 CDT 2019
Revision: 5911
http://sourceforge.net/p/svnbook/source/5911
Author: wuzhouhui
Date: 2019-04-14 11:41:45 +0000 (Sun, 14 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-07 02:32:56 UTC (rev 5910)
+++ branches/1.8/zh/book/ref-svn.xml 2019-04-14 11:41:45 UTC (rev 5911)
@@ -6049,7 +6049,10 @@
<refnamediv>
<refname>svn move (mv)</refname>
+ <!--
<refpurpose>Move a file or directory.</refpurpose>
+ -->
+ <refpurpose>移动一个文件或目录.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -6058,27 +6061,47 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>This command moves files or directories in your
working copy or in the repository.</para>
+ -->
+ <para>该命令用于在工作副本或仓库中移动文件或目录.</para>
<tip>
+ <!--
<para>This command is equivalent to an <command>svn
copy</command> followed by <command>svn
delete</command>.</para>
+ -->
+ <para>这个命令等价于先执行 <command>svn copy</command>, 再执行
+ <command>svn delete</command>.</para>
</tip>
+ <!--
<para>When moving multiple sources, they will be added as
children of <replaceable>DST</replaceable>, which must be
a directory.</para>
+ -->
+ <para>如果 <replaceable>SRC</replaceable> 出现了多次, 它们将被移动
+ 到 <replaceable>DST</replaceable> 内, 这就意味着
+ <replaceable>DST</replaceable> 必须是一个目录.</para>
<note>
+ <!--
<para>Subversion does not support moving between working
copies and URLs. In addition, you can only move files
within a single repository—Subversion does not
support cross-repository moving. Subversion supports
the following types of moves within a single repository:</para>
+ -->
+ <para>Subversion 不支持在工作副本和 URL 之间移动, 而且只能在同一仓库
+ 内移动—即 Subversion 不支持在不同的仓库之间移动. 在同一仓库
+ 内, Subversion 支持以下类型的移动:</para>
</note>
<variablelist>
@@ -6086,8 +6109,11 @@
<varlistentry>
<term>WC → WC</term>
<listitem>
+ <!--
<para>Move and schedule a file or directory for
addition (with history).</para>
+ -->
+ <para>在工作副本内移动文件, 但还未提交到仓库中.</para>
</listitem>
</varlistentry>
@@ -6094,26 +6120,42 @@
<varlistentry>
<term>URL → URL</term>
<listitem>
+ <!--
<para>Complete server-side rename.</para>
+ -->
+ <para>在仓库内完成移动, 会马上触发一个提交操作. </para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>When moving large trees you should be aware that the
URL → URL moves are lighter than WC → WC moves. Moving
nodes inside a working copy does more than just change directory
listings (it will copy files, manage temporary files, and expand
keywords) and may be significantly slower.</para>
+ -->
+ <para>如果被移动的文件较多, 那么用户应该使用更轻量的 URL → URL,
+ 在工作副本内移动文件不仅仅是修改目录列表 (还要复制文件, 管理临时文件
+ 和扩展关键字), 可能会耗费较多的时间.</para>
+ <!--
<para>Also bear in mind that a WC → WC move in a
mixed-revision working copy may yield unexpected results
(see <xref linkend="svn.basic.in-action.mixedrevs" />).</para>
+ -->
+ <para>还要注意的是 WC → WC 移动版本号混合的工作副本可能会产生无法
+ 预知的后果 (见 <xref linkend="svn.basic.in-action.mixedrevs" />).
+ </para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -6133,9 +6175,15 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Move a file in your working copy:</para>
+ -->
+ <para>移动工作副本里的一个文件:</para>
<informalexample>
<screen>
@@ -6145,8 +6193,11 @@
</screen>
</informalexample>
+ <!--
<para>Move several files in your working copy into a
subdirectory:</para>
+ -->
+ <para>把工作副本里的几个文件移动到一个目录内:</para>
<informalexample>
<screen>
@@ -6160,8 +6211,12 @@
</screen>
</informalexample>
+ <!--
<para>Move a file in the repository (this is an immediate commit,
so it requires a commit message):</para>
+ -->
+ <para>在仓库内移动一个文件 (这会产生一个提交操作, 所以需要提供提交日志
+ 消息):</para>
<informalexample>
<screen>
@@ -6188,8 +6243,11 @@
<refnamediv>
<refname>svn patch</refname>
+ <!--
<refpurpose>Apply changes represented in a unidiff patch to
the working copy.</refpurpose>
+ -->
+ <refpurpose>把一个标准差异格式的补丁应用到工作副本中.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -6198,8 +6256,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>This subcommand will apply changes described a
unidiff-formatted patch
file <replaceable>PATCHFILE</replaceable> to the working
@@ -6212,12 +6274,21 @@
command or third-party differencing tools. Any
non-unidiff content found in the patch file is
ignored.</para>
+ -->
+ <para>该命令把标准差异格式的补丁 <replaceable>PATCHFILE</replaceable>
+ 应用到工作副本路径 <replaceable>WCPATH</replaceable> 上. 和大多数
+ 操作工作副本的子命令一样, 如果省略了 <replaceable>WCPATH</replaceable>,
+ 应用补丁的将会是当前工作目录. 有很多工具都能生成标准差异格式的补丁,
+ 例如 <command>svn diff</command> 和 Unix 命令 <command>diff</command>.
+ <command>svn patch</command> 会忽略补丁中不是标准差异的内容.</para>
+ <!--
<para>Changes listed in the patch file will either be
applied or rejected. If a change does not match at its
exact line offset, it may be applied earlier or later in
the file if a match is found elsewhere for the surrounding
lines of context provided by the patch. A change may also
+ ### TODO
be applied with <firstterm>fuzz</firstterm>—meaning,
one or more lines of context are ignored when attempting
to match the change location. If no matching context can
@@ -6224,6 +6295,14 @@
be found for a change, the change conflicts and will be
written to a reject file which bears the extension
<filename>.svnpatch.rej</filename>.</para>
+ -->
+ <para>补丁中的修改要么被接受, 要么被拒绝. 如果没办法在准确的位置上
+ 匹配一个修改, 那么 Subversion 将会在更前或更后的位置进行匹配. 还
+ 可以 <firstterm>模糊地</firstterm> (<firstterm>fuzz</firstterm>)
+ 应用修改—也就是在尝试匹配应用修改的位置时, 忽略上下文中的一
+ 行或更多的行. 如果无法为一个修改找到匹配的位置, 该修改将被认为发生
+ 了冲突, 并被写到一个扩展名为 <filename>.svnpatch.rej</filename> 的
+ 文件中.</para>
<para><command>svn patch</command> reports a status line for
patched file or directory using letter codes, very similar
More information about the svnbook-dev
mailing list