[svnbook] r5918 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat May 11 22:18:30 CDT 2019
Revision: 5918
http://sourceforge.net/p/svnbook/source/5918
Author: wuzhouhui
Date: 2019-05-12 03:18:29 +0000 (Sun, 12 May 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-05-11 13:04:12 UTC (rev 5917)
+++ branches/1.8/zh/book/ref-svn.xml 2019-05-12 03:18:29 UTC (rev 5918)
@@ -8650,21 +8650,33 @@
</informalexample>
<note>
- <para><option>--show-updates</option>
+ <!--
+ <para><option>- -show-updates</option>
(<option>-u</option>) <emphasis>only</emphasis> places
an asterisk next to items that are out of date (i.e.,
items that will be updated from the repository if you
later use <command>svn update</command>).
- <option>--show-updates</option> (<option>-u</option>)
+ <option>- -show-updates</option> (<option>-u</option>)
does <emphasis>not</emphasis> cause the status listing
to reflect the repository's version of the item
(although you can see the revision number in the
- repository by passing the <option>--verbose</option>
+ repository by passing the <option>- -verbose</option>
(<option>-v</option>) option).</para>
+ -->
+ <para>选项 <option>--show-updates</option> (<option>-u</option>)
+ <emphasis>只会</emphasis> 在项目旁边打印一个星号 (意思是说仓库中
+ 有更新的版本). 选项 <option>--show-updates</option>
+ (<option>-u</option>) <emphasis>不会</emphasis> 打印该项目在仓库中
+ 的版本号 (但你仍然可以用选项 <option>--verbose</option>
+ (<option>-v</option>) 查看项目在仓库中的版本号).</para>
</note>
+ <!--
<para>The most information you can get out of
the status subcommand is as follows:</para>
+ -->
+ <para>在最详细的情况下, <command>svn status</command> 打印的信息如下:
+ </para>
<informalexample>
<screen>
@@ -8677,9 +8689,13 @@
</screen>
</informalexample>
+ <!--
<para>Lastly, you can get <command>svn status</command>
- output in XML format with the <option>--xml</option>
+ output in XML format with the <option>- -xml</option>
option:</para>
+ -->
+ <para>最后, 如果指定了选项 <option>--xml</option>, 则 <command>svn
+ status</command> 将以 XML 格式打印输出:</para>
<informalexample>
<screen>
@@ -8714,8 +8730,12 @@
</screen>
</informalexample>
+ <!--
<para>For many more examples of <command>svn status</command>,
see <xref linkend="svn.tour.cycle.examine.status"/>.</para>
+ -->
+ <para>关于 <command>svn status</command> 的更多例子, 见
+ <xref linkend="svn.tour.cycle.examine.status"/>.</para>
</refsect1>
</refentry>
@@ -8733,7 +8753,10 @@
<refnamediv>
<refname>svn switch (sw)</refname>
+ <!--
<refpurpose>Update working copy to a different URL.</refpurpose>
+ -->
+ <refpurpose>将工作副本更新到另一个 URL.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -8743,10 +8766,14 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>The first variant of this subcommand (without the
- <option>--relocate</option> option) updates your working
+ <option>- -relocate</option> option) updates your working
copy to point to a new URL. This is the Subversion way to
make a working copy begin tracking a new branch. If
specified, <replaceable>PEGREV</replaceable> determines in
@@ -8753,18 +8780,31 @@
which revision the target is first looked up. See
<xref linkend="svn.branchmerge.switchwc"/> for an in-depth
look at switching.</para>
+ -->
+ <para>命令的第一种形式 (不带有选项 <option>--relocate</option>) 把工作
+ 副本更新到一个新的 URL. 这是 Subversion 提供的, 用于让工作副本跟踪一
+ 个新分支的方式. 如果指定了 <replaceable>PEGREV</replaceable>, 则
+ <replaceable>PEGREV</replaceable> 决定了 Subversion 在哪个版本号内
+ 查找目标路径. 关于分支切换的更多信息, 见 <xref
+ linkend="svn.branchmerge.switchwc"/>.</para>
<note>
+ <!--
<para>Beginning with Subversion 1.7, the <command>svn
switch</command> command will demand by default that the
URL to which you are switching your working copy shares
a common ancestry with item that the working copy
currently reflects. You can override this behavior by
- specifying the <option>--ignore-ancestry</option>
+ specifying the <option>- -ignore-ancestry</option>
option.</para>
+ -->
+ <para>从 Subversion 1.7 开始, <command>svn switch</command> 要求新
+ 的 URL 必须和工作副本当前的 URL 具有相同的祖先. 为了忽略这一要求,
+ 可以指定选项 <option>--ignore-ancestry</option>.</para>
</note>
- <para>If <option>--force</option> is used, unversioned
+ <!--
+ <para>If <option>- -force</option> is used, unversioned
obstructing paths in the working copy do not automatically
cause a failure if the switch attempts to add the same
path. If the obstructing path is the same type (file or
@@ -8777,24 +8817,47 @@
like a local modification to the working copy. All
properties from the repository are applied to the
obstructing path.</para>
+ -->
+ <para>如果指定了选项 <option>--force</option>, 那么 <command>svn
+ switch</command> 在添加一个新路径时, 如果该路径在切换前是一个未
+ 被版本控制的路径, 将不会产生一个错误. 如果未被版本控制的路径和
+ 切换后的新路径类型相同 (文件或目录), 则路径将被纳入版本控制, 但原来
+ 的内容保持不变, 这也意味着目录的子文件也可能被纳入版本控制. 对于文件
+ 来说, 不同的部分将被当作本地修改. 来自仓库的所有属性都会被应用到路径
+ 上.</para>
+ <!--
<para>As with most subcommands, you can limit the scope of
the switch operation to a particular tree depth using the
- <option>--depth</option> option. Alternatively, you can
- use the <option>--set-depth</option> option to set a new
+ <option>- -depth</option> option. Alternatively, you can
+ use the <option>- -set-depth</option> option to set a new
<quote>sticky</quote> working copy depth on the switch
target.</para>
+ -->
+ <para>和大多数子命令一样, 用户可以通过选项 <option>--depth</option>
+ 限制 <command>svn switch</command> 的作用深度. 相应地, 用户还可以用
+ 选项 <option>--set-depth</option> 为目标路径设置新的
+ <quote>粘着</quote> 深度.</para>
- <para>The <option>--relocate</option> option is deprecated
+ <!--
+ <para>The <option>- -relocate</option> option is deprecated
as of Subversion 1.7. Use <command>svn relocate</command>
(described in <xref linkend="svn.ref.svn.c.relocate" />)
to perform working copy relocation instead.</para>
+ -->
+ <para>从 Subversion 1.7 开始, 选项 <option>--relocate</option> 已不再
+ 推荐使用, 而应直接使用 <command>svn relocate</command> (见 <xref
+ linkend="svn.ref.svn.c.relocate" />) 完成工作副本仓库根 URL 的
+ 更新.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -8814,12 +8877,19 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>If you're currently inside the directory
<filename>vendors</filename>, which was branched to
<filename>vendors-with-fix</filename>, and you'd like to
switch your working copy to that branch:</para>
+ -->
+ <para>如果你现在正在目录 <filename>vendors</filename> 内, 而现在你想
+ 让该目录指向分支 <filename>vendors-with-fix</filename>:</para>
<informalexample>
<screen>
@@ -8832,9 +8902,12 @@
</screen>
</informalexample>
+ <!--
<para>To switch back, just provide the URL to the
location in the repository from which you originally
checked out your working copy:</para>
+ -->
+ <para>工作完成后, 可以再切换回分支 <filename>vendors</filename>:</para>
<informalexample>
<screen>
@@ -8848,6 +8921,7 @@
</informalexample>
<tip>
+ <!--
<para>You <emphasis>can</emphasis> switch just part of
your working copy to a branch if you don't want to
switch your entire working copy, but this is not
@@ -8855,6 +8929,10 @@
you've done this and wind up accidentally making and
committing changes both to the switched and unswitched
portions of your tree.</para>
+ -->
+ <para>用户 <emphasis>可以</emphasis> 只切换工作副本的一部分到一个
+ 新的分支, 但这不是推荐的做法. 因为很容易忘记工作副本只是部分切换
+ 的, 然后用户意外地同时修改并提交到已切换到未切换的目录树中.</para>
</tip>
</refsect1>
More information about the svnbook-dev
mailing list