[svnbook] r5885 committed - branches/1.8/zh/book/ref-svn.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Sat Feb 23 06:35:35 CST 2019


Revision: 5885
          http://sourceforge.net/p/svnbook/source/5885
Author:   wuzhouhui
Date:     2019-02-23 12:35:33 +0000 (Sat, 23 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-22 05:16:03 UTC (rev 5884)
+++ branches/1.8/zh/book/ref-svn.xml	2019-02-23 12:35:33 UTC (rev 5885)
@@ -278,6 +278,8 @@
       <varlistentry id="svn.ref.svn.sw.allow_mixed_revisions">
         <term><option>--allow-mixed-revisions</option></term>
         <listitem>
+      <!--
+          ### TODO
           <para>Disables the verification—performed by default
             by <command>svn merge</command> as of Subversion
             1.7—that the target of a merge operation and all
@@ -286,6 +288,11 @@
             the recommended best practice, this option may be used
             to permit merges into mixed-revision working copies as
             necessary.</para>
+      -->
+          <para>在合并时, 不去核实目标及其子文件的版本号是否是一致的, 从
+            Subversion 1.7 开始, 默认都会去核实版本号是否一致. 虽然推荐的
+            做法是让工作副本处于一个单一的版本号下, 但必要时还是可以用这个
+            选项允许向版本号混合的工作副本执行合并.</para>
         </listitem>
       </varlistentry>
 
@@ -292,10 +299,15 @@
       <varlistentry id="svn.ref.svn.sw.auto_props">
         <term><option>--auto-props</option></term>
         <listitem>
+      <!--
+                                                       ### TODO
           <para>Enables automatic property assignment (per runtime
             configuration rules), overriding the
             <literal>enable-auto-props</literal> runtime
             configuration directive.</para>
+      -->
+          <para>允许自动属性设置, 它将覆盖运行时配置指令
+            <literal>enable-auto-props</literal> 的设置.</para>
         </listitem>
       </varlistentry>
       
@@ -302,6 +314,7 @@
       <varlistentry id="svn.ref.svn.sw.change">
         <term><option>--change</option> (<option>-c</option>) <replaceable>ARG</replaceable></term>
         <listitem>
+      <!--
           <para>Perform the requested operation using a specific
             <quote>change</quote>.  Generally speaking, this option
             is syntactic sugar for <userinput>-r
@@ -319,6 +332,18 @@
             implied revision range is reversed: <userinput>-c
             -45</userinput> is equivalent to <userinput>-r
             45:44</userinput>.</para>
+      -->
+        <para>使用一个特定的 <quote>修改</quote> 执行所请求的操作. 通常来说,
+          这个选项是 <userinput>-r
+            <replaceable>ARG-1</replaceable>:<replaceable>ARG</replaceable></userinput>
+          的语法糖. 某些子命令允许选项的参数是逗号分隔的版本号列表 (即
+          <userinput>-c
+            <replaceable>ARG1</replaceable>,<replaceable>ARG2</replaceable>,<replaceable>ARG3</replaceable></userinput>),
+          用户还可以用连字符分隔的两个版本号指定一个版本号范围 (即
+          <userinput>-c <replaceable>ARG1</replaceable>-<replaceable>ARG2</replaceable></userinput>
+          ), 范围包括起始与结束版本号. 最后, 如果版本号是一个负数, 则表示相反
+          的版本号范围, 例如 <userinput>-c -45</userinput> 等价于
+          <userinput>-r 45:44</userinput>.</para>
         </listitem>
       </varlistentry>
 
@@ -325,9 +350,14 @@
       <varlistentry id="svn.ref.svn.sw.changelist">
         <term><option>--changelist</option> (<option>--cl</option>) <replaceable>ARG</replaceable></term>
         <listitem>
+      <!--
           <para>Instructs Subversion to operate only on members of the changelist named
             <replaceable>ARG</replaceable>.  You can use this option
             multiple times to specify sets of changelists.</para>
+      -->
+          <para>告诉 Subversion 只去操作属于变更列表
+            <replaceable>ARG</replaceable> 的文件, 用户可以多次使用这个选项,
+            从而指定多个变更列表.</para>
         </listitem>
       </varlistentry>
 
@@ -334,14 +364,21 @@
       <varlistentry id="svn.ref.svn.sw.config_dir">
         <term><option>--config-dir</option> <replaceable>DIR</replaceable></term>
         <listitem>
+      <!--
           <para>Instructs Subversion to read configuration
             information from the specified directory instead of the
             default location (<filename>.subversion</filename> in
             the user's home directory).</para>
+      -->
+          <para>告诉 Subversion 从指定的目录 (而不是默认的
+            <filename>.subversion</filename>) 中读取配置信息.</para>
 
           <note>
+      <!--
             <para>This option is accepted by
               all <command>svn</command> subcommands.</para>
+      -->
+            <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
           </note>
         </listitem>
       </varlistentry>
@@ -349,6 +386,7 @@
       <varlistentry id="svn.ref.svn.sw.config_option">
         <term><option>--config-option</option> <replaceable>CONFSPEC</replaceable></term>
         <listitem>
+      <!--
           <para>Sets, for the duration of the command, the value of
             a runtime configuration
             option.  <replaceable>CONFSPEC</replaceable> is a string
@@ -366,13 +404,30 @@
             you wish to assign to the option.  For example, to
             temporarily disable the use of the compression in the
             HTTP protocol,
-            use <option>--config-option=servers:global:http-compression=no</option>.
+            use <option>- -config-option=servers:global:http-compression=no</option>.
             You can use this option multiple times to change
             multiple option values simultaneously.</para>
+      -->
+          <para>在命令执行期间设置运行时配置选项.
+            <replaceable>CONFSPEC</replaceable> 是一个指定了运行时配置选项的
+            名字空间, 选项名和选项值的字符串, 形式是
+            <replaceable>FILE</replaceable>:<replaceable>SECTION</replaceable>:<replaceable>OPTION</replaceable>=[<replaceable>VALUE</replaceable>],
+            其中, <replaceable>FILE</replaceable> 和
+            <replaceable>SECTION</replaceable> 分别是选项所在的运行时配置文件
+            (<literal>config</literal> 或 <literal>server</literal>) 和配置
+            文件里的节. <replaceable>OPTION</replaceable> 就是选项本身, 而
+            <replaceable>VALUE</replaceable> (如果有的话) 就是选项的值. 比如
+            说用户想要临时禁止 HTTP 压缩, 那就可以把
+            <option>--config-option</option> 写成
+            <option>--config-option=servers:global:http-compression=no</option>.
+            该选项可以在命令行上出现多次.</para>
 
           <note>
+      <!--
             <para>This option is accepted by
               all <command>svn</command> subcommands.</para>
+      -->
+            <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
           </note>
         </listitem>
       </varlistentry>
@@ -380,6 +435,7 @@
       <varlistentry id="svn.ref.svn.sw.depth">
         <term><option>--depth</option> <replaceable>ARG</replaceable></term>
         <listitem>
+      <!--
           <para>Instructs Subversion to limit the scope of an
             operation to a particular tree
             depth.  <replaceable>ARG</replaceable> is one of
@@ -390,6 +446,13 @@
             immediate children thereof), or
             <literal>infinity</literal> (the target and all of its
             descendants—full recursion).</para>
+      -->
+          <para>告诉 Subversion 把命令的操作范围限制在一个指定的目录深度内.
+            <replaceable>ARG</replaceable> 可以是 <literal>empty</literal>
+            (目标本身), 或 <literal>files</literal> (目标和目标的直接子文件,
+            不包括直接子目录), <literal>immediates</literal> (目标和目标的直接
+            子文件, 包括直接子目录), 或 <literal>infinity</literal> (目标和
+            目标的所有子孙—即完全递归).</para>
         </listitem>
       </varlistentry>
 
@@ -396,10 +459,14 @@
       <varlistentry id="svn.ref.svn.sw.diff">
         <term><option>--diff</option></term>
         <listitem>
+      <!--
           <para>Enables a special output mode for <command>svn
             log</command> which includes a difference report (a
             la <command>svn diff</command>) as part of each
             revision's information.</para>
+      -->
+          <para>告诉 <command>svn log</command> 输出版本号所包含的差异
+            (按照 <command>svn diff</command> 的方式进行输出).</para>
         </listitem>
       </varlistentry>
 
@@ -406,15 +473,22 @@
       <varlistentry id="svn.ref.svn.sw.diff_cmd">
         <term><option>--diff-cmd</option> <replaceable>CMD</replaceable></term>
         <listitem>
+      <!--
           <para>Specifies an external program to use to show
             differences between files.  When <command>svn
             diff</command> is invoked without this option, it uses
             Subversion's internal differencing engine, which provides
             unified diffs by default.  If you want to use an
-            external differencing program, use <option>--diff-cmd</option>.
+            external differencing program, use <option>- -diff-cmd</option>.
             You can then pass options to the specified program using the
-            <option>--extensions</option> (<option>-x</option>)
+            <option>- -extensions</option> (<option>-x</option>)
             option.</para>
+      -->
+          <para>指定一个外部差异比较工具. 如果在执行 <command>svn diff</command>
+            时没有指定该选项, Subversion 将会使用它自己的差异比较引擎, 默认
+            按照标准差异格式进行输出. 如果用户希望使用一个外部的差异比较工具,
+            就可以用该选项实现, 然后还可以用选项 <option>--extensions</option>
+            (<option>-x</option>) 为外部差异比较工具传递选项.</para>
         </listitem>
       </varlistentry>
     
@@ -421,8 +495,11 @@
       <varlistentry id="svn.ref.svn.sw.diff3_cmd">
         <term><option>--diff3-cmd</option> <replaceable>CMD</replaceable></term>
         <listitem>
+      <!--
           <para>Specifies an external 3-way differencing program
             (used to merge line-based changes into files).</para>
+      -->
+          <para>指定一个外部的三路差异比较工具 (用于合并文件的修改).</para>
         </listitem>
       </varlistentry>
     
@@ -429,9 +506,13 @@
       <varlistentry id="svn.ref.svn.sw.dry_run">
         <term><option>--dry-run</option></term>
         <listitem>
+      <!--
           <para>Goes through all the motions of running a command,
             but makes no actual changes—either on disk or in
             the repository.</para>
+      -->
+          <para>除了做出实际的修改外—无论是修改工作副本还是仓库—
+            执行命令的所有过程.</para>
         </listitem>
       </varlistentry>
     
@@ -438,10 +519,16 @@
       <varlistentry id="svn.ref.svn.sw.editor_cmd">
         <term><option>--editor-cmd</option> <replaceable>CMD</replaceable></term>
         <listitem>
+      <!--
           <para>Specifies an external program to use to edit a log message
             or a property value.  See the <literal>editor-cmd</literal>
             section in <xref linkend="svn.advanced.confarea.opts.config"/>
             for ways to specify a default editor.</para>
+      -->
+          <para>指定一个外部文本编辑器, 用于编辑日志消息或属性值. 关于如何
+            指定一个默认文本编辑器, 见 <xref
+              linkend="svn.advanced.confarea.opts.config"/> 的
+            <literal>editor-cmd</literal> 节.</para>
         </listitem>
       </varlistentry>
     
@@ -448,6 +535,7 @@
       <varlistentry id="svn.ref.svn.sw.encoding">
         <term><option>--encoding</option> <replaceable>ENC</replaceable></term>
         <listitem>
+      <!--
           <para>Tells Subversion that your commit message is
             composed using the character encoding provided.  The
             default character encoding is derived from your
@@ -454,6 +542,11 @@
             operating system's native locale; use this option if
             your commit message is composed using any other
             encoding.</para>
+      -->
+          <para>告诉 Subversion 你的提交消息是用该选项所指定的字符集编码编写的.
+            默认情况下, Subversion 根据操作系统的本地语言环境判断提交消息的
+            字符集编码, 如果你用了其他字符集编码, 就要用该选项显式地告诉
+            Subversion 你所用的字符集编码.</para>
         </listitem>
       </varlistentry>
 




More information about the svnbook-dev mailing list