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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Sat Mar 16 21:53:46 CDT 2019


Revision: 5903
          http://sourceforge.net/p/svnbook/source/5903
Author:   wuzhouhui
Date:     2019-03-17 02:53:45 +0000 (Sun, 17 Mar 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-03-16 03:23:39 UTC (rev 5902)
+++ branches/1.8/zh/book/ref-svn.xml	2019-03-17 02:53:45 UTC (rev 5903)
@@ -2972,8 +2972,11 @@
 
     <refnamediv>
       <refname>svn copy (cp)</refname>
+      <!--
       <refpurpose>Copy a file or directory in a working copy or
         in the repository.</refpurpose>
+      -->
+      <refpurpose>在工作副本或仓库中复制一个文件或目录.</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
@@ -2982,8 +2985,12 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Description</title>
+      -->
+      <title>描述</title>
       
+      <!--
       <para>Copy one or more files in a working copy or in the
         repository. <replaceable>SRC</replaceable> and
         <replaceable>DST</replaceable> can each be either a
@@ -2991,6 +2998,13 @@
         sources, add the copies as immediate children
         of <replaceable>DST</replaceable> (which, of course, must
         be an existing directory).</para>
+      -->
+      <para>在工作副本或仓库中复制一个或多个文件.
+        <replaceable>SRC</replaceable> 和 <replaceable>DST</replaceable>
+        可以是一个工作副本 (WC) 路径或 URL. 当复制多个源文件时, 每个源文件
+        都将是 <replaceable>DST</replaceable> (此时
+        <replaceable>DST</replaceable> 必须是一个已存在的目录) 直接子文件.
+      </para>
         
         <variablelist>
 
@@ -2997,8 +3011,11 @@
           <varlistentry>
             <term>WC → WC</term>
             <listitem>
+      <!--
               <para>Copy and schedule an item for
                 addition (with history).</para>
+      -->
+              <para>复制并添加一个工作副本路径 (包含历史).</para>
             </listitem>
           </varlistentry>
 
@@ -3005,7 +3022,10 @@
           <varlistentry>
             <term>WC → URL</term>
             <listitem>
+      <!--
               <para>Immediately commit a copy of WC to URL.</para>
+      -->
+              <para>立刻把 WC 的副本提交到 URL.</para>
             </listitem>
           </varlistentry>
 
@@ -3012,8 +3032,11 @@
           <varlistentry>
             <term>URL → WC</term>
             <listitem>
+      <!--
               <para>Check out URL into WC and schedule it for
                 addition.</para>
+      -->
+              <para>把 URL 检出到 WC, 并添加 WC.</para>
             </listitem>
           </varlistentry>
 
@@ -3020,13 +3043,17 @@
           <varlistentry>
             <term>URL → URL</term>
             <listitem>
+      <!--
               <para>Complete server-side copy.  This is
                 usually used to branch and tag.</para>
+      -->
+              <para>执行一个服务器端的复制. 这通常用于创建分支和标签.</para>
             </listitem>
           </varlistentry>
 
         </variablelist>
 
+      <!--
       <para>If no peg revision (i.e.,
         <replaceable>@REV</replaceable>) is supplied, by default
         the <literal>BASE</literal> revision will be used for
@@ -3033,10 +3060,19 @@
         files copied from the working copy, while the
         <literal>HEAD</literal> revision will be used for files
         copied from a URL.</para>
+      -->
+      <para>如果没有提供限定版本号 (即
+        <literal>@<replaceable>REV</replaceable></literal>), 那么在复制工作
+        副本路径时, 默认使用 <literal>BASE</literal> 版本号, 在复制 URL
+        时默认使用 <literal>HEAD</literal> 版本号.</para>
 
       <note>
+      <!--
         <para>You can only copy files within a single repository.
           Subversion does not support cross-repository copying.</para>
+      -->
+        <para>你只能在同一个仓库内复制文件, Subversion 不支持在不同的仓库之间
+          进行复制.</para>
       </note>
 
     </refsect1>
@@ -3043,7 +3079,10 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Options</title>
+      -->
+      <title>选项</title>
 
       <informalexample>
         <screen>
@@ -3063,11 +3102,18 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Examples</title>
+      -->
+      <title>示例</title>
 
+      <!--
       <para>Copy an item within your working copy (this
         schedules the copy—nothing goes into the repository
         until you commit):</para>
+      -->
+      <para>复制工作副本里的一个文件, 并把它添加到需要被版本控制的列表里
+        (在提交之前, 这个复制操作丝毫不会影响到仓库):</para>
 
       <informalexample>
         <screen>
@@ -3078,8 +3124,11 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Copy several files in a working copy into a
         subdirectory:</para>
+      -->
+      <para>把工作副本里的多个文件复制到一个目录内:</para>
 
       <informalexample>
         <screen>
@@ -3090,8 +3139,12 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Copy revision 8 of <filename>bat.c</filename> into your
         working copy under a different name:</para>
+      -->
+      <para>复制工作副本文件 <filename>bat.c</filename> 的版本号 8, 并重新
+        命名复制后的文件.</para>
 
       <informalexample>
         <screen>
@@ -3100,9 +3153,13 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Copy an item in your working copy to a URL in the
         repository (this is an immediate commit, so you must supply a
         commit message):</para>
+      -->
+      <para>把工作副本里的文件复制到仓库中 (这个复制会马上提交, 所以用户
+        需要提供提交日志):</para>
 
       <informalexample>
         <screen>
@@ -3112,9 +3169,13 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Copy an item from the repository to your working
         copy (this just schedules the copy—nothing goes into the
         repository until you commit):</para>
+      -->
+      <para>从仓库复制一个文件到工作副本中 (在提交之前, 这个复制操作丝毫不会
+        影响到仓库):</para>
 
       <informalexample>
         <screen>
@@ -3124,11 +3185,17 @@
       </informalexample>
 
       <tip>
+      <!--
         <para>This is the recommended way to resurrect a dead
           file in your repository!</para>
+      -->
+        <para>这是找回仓库中已被删除文件的推荐方式!</para>
       </tip>
 
+      <!--
       <para>And finally, copy between two URLs:</para>
+      -->
+      <para>最后是从一个 URL 复制到另一个 URL:</para>
 
       <informalexample>
         <screen>
@@ -3149,14 +3216,23 @@
       </informalexample>
 
       <tip>
+      <!--
         <para>This is the easiest way to <quote>tag</quote> a
           revision in your repository—just <command>svn
           copy</command> that revision (usually
           <literal>HEAD</literal>) into your <filename>tags</filename> directory.</para>
+      -->
+        <para>这是打标签最简单的方法—只需要用 <command>svn copy</command>
+          把版本号 (通常是 <literal>HEAD</literal>) 复制到
+          <filename>tags</filename> 目录中.</para>
       </tip>
 
+      <!--
       <para>And don't worry if you forgot to tag—you can
         always specify an older revision and tag anytime:</para>
+      -->
+      <para>即使忘记打标签也不需要担心—在任何时候, 你总是可以为一个较
+        老的版本号创建标签:</para>
 
       <informalexample>
         <screen>
@@ -3183,8 +3259,11 @@
 
     <refnamediv>
       <refname>svn delete (del, remove, rm)</refname>
+      <!--
       <refpurpose>Delete an item from a working copy
         or the repository.</refpurpose>
+      -->
+      <refpurpose>从工作副本或仓库中删除文件.</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
@@ -3194,27 +3273,45 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Description</title>
+      -->
+      <title>描述</title>
 
+      <!--
       <para>Items specified by <replaceable>PATH</replaceable> are
         scheduled for deletion upon the next commit.  Files (and
         directories that have not been committed) are immediately
         removed from the working copy unless the
-        <option>--keep-local</option> option is given.  The
+        <option>- -keep-local</option> option is given.  The
         command will not remove any unversioned or modified items;
-        use the <option>--force</option> option to override this
+        use the <option>- -force</option> option to override this
         behavior. A directory that contains unversioned or modified
-        items will not be deleted, unless the <option>--force</option>
+        items will not be deleted, unless the <option>- -force</option>
         is used.</para>
+      -->
+      <para>由 <replaceable>PATH</replaceable> 指定的文件将在提交时从仓库中
+        删除. 执行完命令后, 文件和未被提交的目录会马上从工作副本中删除, 除非
+        指定了选项 <option>--keep-local</option>. 命令不会删除未被版本控制或
+        含有本地修改的文件, 除非指定了选项 <option>--force</option>. 如果目录
+        内含有未被版本控制的文件, 或者文件含有本地修改, 这个目录就不会被删除,
+        除非指定了选项 <option>--force</option>.</para>
 
+      <!--
       <para>Items specified by URL are deleted from
         the repository via an immediate commit.  Multiple URLs are
         committed atomically.</para>
+      -->
+      <para>由 URL 指定的文件会马上触发一个提交操作, 然后直接从仓库中删除.
+        如果指定了多个 URL, 它们将在同一个提交中完成删除.</para>
     </refsect1>
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Options</title>
+      -->
+      <title>选项</title>
 
       <informalexample>
         <screen>
@@ -3234,13 +3331,20 @@
     
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Examples</title>
+      -->
+      <title>示例</title>
 
+      <!--
       <para>Using <command>svn</command> to delete a file from
         your working copy deletes your local copy of the file, but
         it merely schedules the file to be deleted from the
         repository.  When you commit, the file is deleted in the
         repository.</para>
+      -->
+      <para><command>svn delete</command> 会删除工作副本里的文件, 但要等到
+        提交后才会从仓库中删除.</para>
 
       <informalexample>
         <screen>
@@ -3254,8 +3358,12 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Deleting a URL, however, is immediate, so you have
         to supply a log message:</para>
+      -->
+      <para>删除由 URL 指定的文件会马上触发一个提交操作, 所以用户需要提供
+        提交日志:</para>
 
       <informalexample>
         <screen>
@@ -3266,8 +3374,11 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Here's an example of how to force deletion of a file
         that has local mods:</para>
+      -->
+      <para>下面的例子展示了如何强制删除含有本地修改的文件:</para>
 
       <informalexample>
         <screen>




More information about the svnbook-dev mailing list