[svnbook] r5862 committed - branches/1.8/zh/book/ch07-customizing-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Fri Jan 11 07:04:47 CST 2019
Revision: 5862
http://sourceforge.net/p/svnbook/source/5862
Author: wuzhouhui
Date: 2019-01-11 13:04:43 +0000 (Fri, 11 Jan 2019)
Log Message:
-----------
1.8/zh: chapter 7 translated, but review needed
Modified Paths:
--------------
branches/1.8/zh/book/ch07-customizing-svn.xml
Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml 2019-01-08 14:09:32 UTC (rev 5861)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml 2019-01-11 13:04:43 UTC (rev 5862)
@@ -2353,7 +2353,8 @@
-->
<para><xref linkend="svn.advanced.externaldifftools.diff3.ex-1"/>
和 <xref linkend="svn.advanced.externaldifftools.diff3.ex-2"/> 是
- 外部合并工具包装的模板, 分别用 Python 和 Windows 批处理脚本编写.
+ 外部三路差异比较工具的包装脚本模板, 分别用 Python 和 Windows 批处
+ 理脚本编写.
</para>
<example id="svn.advanced.externaldifftools.diff3.ex-1">
@@ -2416,8 +2417,12 @@
<!-- =============================================================== -->
<sect2 id="svn.advanced.externaldifftools.merge">
+ <!--
<title>External merge</title>
+ -->
+ <title>外部合并工具</title>
+ <!--
<para>Subversion optionally invokes an external merge tool as
part of its support for interactive conflict resolution. It
provides as arguments to the merge tool the following: the
@@ -2430,11 +2435,22 @@
(relative to the original target of the merge operation). The
merge tool is expected to return an error code of 0 to
indicate success, or 1 to indicate failure.</para>
+ -->
+ <para>在交互式地解决冲突时, Subversion 可以选择调用一个外部合并工具.
+ Subversion 提供给外部合并工具的参数有: 未修改的基础文件路径,
+ <quote>他们的</quote> 文件路径 (含有上游修改), <quote>我们的</quote>
+ 文件路径 (含有本地修改), 用于存放合并工具合并后的文件路径, 以及发生
+ 冲突的文件的工作副本路径 (相对于合并操作的原始目标). 如果执行成功,
+ 合并工具应该返回 0, 如果发生错误则返回 1.</para>
<para><xref linkend="svn.advanced.externaldifftools.merge.ex-1"/>
and <xref linkend="svn.advanced.externaldifftools.merge.ex-2"/> are
templates for external merge tool wrappers in the Python
and Windows batch scripting languages, respectively.</para>
+ <para><xref linkend="svn.advanced.externaldifftools.merge.ex-1"/>
+ 和 <xref linkend="svn.advanced.externaldifftools.merge.ex-2"/> 是
+ 外部合并工具的包装脚本模板, 分别用 Python 和 Windows 批处理脚本编写.
+ </para>
<example id="svn.advanced.externaldifftools.merge.ex-1">
<title>mergewrap.py</title>
@@ -2495,8 +2511,12 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.customization.summary">
+ <!--
<title>Summary</title>
+ -->
+ <title>小结</title>
+ <!--
<para>Sometimes there's a single right way to do things; sometimes
there are many. Subversion's developers understand that while
the majority of its exact behaviors are acceptable to most of
@@ -2504,7 +2524,13 @@
such a universally pleasing approach doesn't exist. In those
places, Subversion offers users the opportunity to tell it how
<emphasis>they</emphasis> want it to behave.</para>
+ -->
+ <para>有时候, 只能用一种正确的方式来完成任务, 有时候却存在许多种正确方式.
+ 开发人员明白虽然 Subversion 的大多数行为对于大多数用户来说都是可接受的,
+ 但总会存在无法令人满意的角落. 在这种情况下, Subversion 允许用户决定如何
+ 处理.</para>
+ <!--
<para>In this chapter, we explored Subversion's runtime
configuration system and other mechanisms by which users can
control those configurable behaviors. If you are a developer,
@@ -2512,6 +2538,10 @@
describes how you can further customize your Subversion
experience by writing your own software against Subversion's
libraries.</para>
+ -->
+ <para>本章我们介绍了 Subversion 的运行时配置系统, 以及其他可用来配置
+ 运行行为的机制. 如果你是一个开发人员, 下一章将从开发人员的角度介绍如何
+ 利用 Subversion 提供的库函数, 进一步定制 Subversion.</para>
</sect1>
More information about the svnbook-dev
mailing list