[svnbook] r5882 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Feb 19 07:50:10 CST 2019
Revision: 5882
http://sourceforge.net/p/svnbook/source/5882
Author: wuzhouhui
Date: 2019-02-19 13:50:06 +0000 (Tue, 19 Feb 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-02-17 10:57:14 UTC (rev 5881)
+++ branches/1.8/zh/book/ref-svn.xml 2019-02-19 13:50:06 UTC (rev 5882)
@@ -131,6 +131,7 @@
<varlistentry id="svn.ref.svn.sw.accept">
<term><option>--accept</option> <replaceable>ACTION</replaceable></term>
<listitem>
+ <!--
<para>Specifies an action for automatic conflict
resolution, disabling the interactive prompts which ask
the user how to handle each conflict as it is noticed.
@@ -138,14 +139,23 @@
differs depending on which subcommand is in use,
Subversion supports the following long (and short)
values for <replaceable>ACTION</replaceable>:</para>
+ -->
+ <para>为自动的冲突解决指定处理措施, 当 Subversion 注意到冲突发生时不
+ 会再询问用户如何处理. Subversion 支持的
+ <replaceable>ACTION</replaceable> 如下所示, 但不同的子命令, 其可用
+ 的 <replaceable>ACTION</replaceable> 是不同的:</para>
<variablelist>
<varlistentry>
<term><literal>postpone</literal>
(<literal>p</literal>)</term>
<listitem>
+ <!--
<para>Take no resolution action at all and instead
allow the conflicts to be recorded for future
resolution.</para>
+ -->
+ <para>对冲突不采取任何措施, 将冲突记录起来, 以便稍后再作处理.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -152,8 +162,12 @@
<term><literal>edit</literal>
(<literal>e</literal>)</term>
<listitem>
+ <!--
<para>Open each conflicted file in a text editor for
manual resolution of line-based conflicts.</para>
+ -->
+ <para>在文本编辑器中打开每一个冲突文件, 由用户手工处理冲突.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -160,25 +174,36 @@
<term><literal>launch</literal>
(<literal>l</literal>)</term>
<listitem>
+ <!--
<para>Launch an interactive merge conflict
resolution tool for each conflicted file.</para>
+ -->
+ <para>为每一个冲突文件调用交互式的冲突合并工具.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>base</literal></term>
<listitem>
+ <!--
<para>Choose the file that was the (unmodified)
<literal>BASE</literal> revision before you tried
to integrate changes from the server into
your working copy.</para>
+ -->
+ <para>在把服务器上的修改合并到工作副本之前, 把文件指定成版本
+ 号为 <literal>BASE</literal>, 且未修改的版本.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><literal>working</literal></term>
<listitem>
+ <!--
<para>Assuming that you've manually handled the
conflict resolution, choose the version of the file
as it currently stands in your working copy.</para>
+ -->
+ <para>将工作副本里的文件的当前版本作为冲突解决后的版本, 在这
+ 之前用户应该手工处理了文件里的冲突.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -185,10 +210,14 @@
<term><literal>mine-full</literal>
(<literal>mf</literal>)</term>
<listitem>
+ <!--
<para>Resolve conflicted files by preserving all
local modifications and discarding all changes
fetched from the server during the operation which
caused the conflict.</para>
+ -->
+ <para>如果文件发生了冲突, 则保留文件里的所有本地修改, 丢弃
+ 该文件从服务器接收到的所有修改.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -195,10 +224,14 @@
<term><literal>theirs-full</literal>
(<literal>tf</literal>)</term>
<listitem>
+ <!--
<para>Resolve conflicted files by discarding all
local modifications and integrating all changes
fetched from the server during the operation which
caused the conflict.</para>
+ -->
+ <para>如果文件发生了冲突, 则丢弃文件里的所有本地修改, 保留
+ 从服务器接收到的所有修改.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -205,10 +238,14 @@
<term><literal>mine-conflict</literal>
(<literal>mc</literal>)</term>
<listitem>
+ <!--
<para>Resolve conflicted files by preferring local
modifications over the changes fetched from the
server in conflicting regions of each file's
content.</para>
+ -->
+ <para>如果文件的某一区域发生了冲突, 则保留该区域的本地修改,
+ 丢弃从服务器接收到的修改.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -215,17 +252,26 @@
<term><literal>theirs-conflict</literal>
(<literal>tc</literal>)</term>
<listitem>
+ <!--
<para>Resolve conflicted files by preferring the
changes fetched from the server over local
modifications in conflicting regions of each file's
content.</para>
+ -->
+ <para>如果文件的某一区域发生了冲突, 则丢弃该区域的本地修改,
+ 保留从服务器接收到的修改.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>Consult the output of <command>svn help
<replaceable>SUBCOMMAND</replaceable></command> to see
exactly which actions are supported by the specific
subcommand of interest.</para>
+ -->
+ <para>为了查看特定的子命令支持哪些 <replaceable>ACTION</replaceable>,
+ 阅读 <command>svn help <replaceable>SUBCOMMAND</replaceable>
+ </command> 的输出.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list