[svnbook] r5429 committed - branches/1.8/zh/book/ch03-advanced-topics.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Mon Sep 18 07:51:56 CDT 2017

Revision: 5429
Author:   wuzhouhui
Date:     2017-09-18 12:51:56 +0000 (Mon, 18 Sep 2017)
Log Message:
1.8/zh: translation of chapter 3 in progress

Modified Paths:

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-09-17 13:51:06 UTC (rev 5428)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-09-18 12:51:56 UTC (rev 5429)
@@ -8864,6 +8864,7 @@
         内容在本书的其他地方介绍, 但是为了方便读者, 我们在这里统一进行详细地
+      <!--
       <para>Perhaps the most obvious remote commit-like operation is
         the <command>svn import</command> command.  We describe that
         command in <xref linkend="svn.tour.importing.import" /> as
@@ -8870,7 +8871,12 @@
         part of explaining how you can easily get a whole tree of
         unversioned information into your Subversion repository so you
         can start doing version-controlled operations on it.</para>
+      -->
+      <para>最明显的远程类提交操作应该是命令 <command>svn import</command>,
+        我们在 <xref linkend="svn.tour.importing.import"/> 介绍如何快速地把
+        一个目录导入到仓库中时, 提到了这个命令.</para>
+      <!--
       <para>The <command>svn mkdir</command> and <command>svn
         delete</command> commands, when used with URL targets, are
         also remote commit-type operations.  These allow the user to
@@ -8883,7 +8889,15 @@
         working copy.  If there's no problem or conflict detected with
         the requested operation, the server commits the additions or
         removals in a single new revision.</para>
+      -->
+      <para>当目标参数是 URL 时, 命令 <command>svn mkdir</command> 和 <command>
+          svn delete</command> 也可以是远程操作, 这允许用户在没有工作副本的前
+        提下, 在仓库中添加新的目录或 (递归地) 删除文件. 每次执行这两个命令时,
+        客户端与服务器的通信过程类似于把工作副本里新增的目录或删除的文件提交
+        给服务器的过程. 如果认证没有问题, 并且没有发生冲突, 服务器就在一个单独
+        的版本号里完成添加或删除.</para>
+      <!--
       <para>You can use <command>svn copy</command> or <command>svn
         move</command> with two URLs—a copy/move source and a
         destination—to commit a copies and moves of files and
@@ -8894,13 +8908,28 @@
         the <command>svn copy</command> remote operation is commonly
         used to create branches in Subversion, as we discuss later in
         <xref linkend="svn.branchmerge.using.create" />.</para>
+      -->
+      <para>你可以用两个 URL 作为 <command>svn copy</command> 或 <command>
+          svn move</command> 的参数—一个是源, 另一个是目标—直接向
+        仓库提交文件的复制或移动. 如果是在工作副本里执行, 这两个操作将会是耗时
+        最长的操作之一, 如果使用仓库的 URL 进行远程操作, 它们就可以在常数时间
+        内完成. 实际上, 在创建分支时, 人们经常使用 <command>svn copy</command>
+        远程操作, 这部分内容将在 <xref linkend="svn.branchmerge.using.create"/>
+        介绍.</para>
+      <!--
       <para>As with the regular <command>svn commit</command> command,
         you can supply a log message with any of these commands we've
         discussed so far to describe the changes you're making.  Use
-        the <option>--file (-F)</option> or <option>--message
+        the <option>- -file (-F)</option> or <option>- -message
         (-m)</option> option, or otherwise allow the client to prompt
         you for the log message.</para>
+      -->
+      <para>和普通的 <command>svn commit</command> 一样, 上面介绍的几个远程
+        操作都接受用户输入一段日志, 描述本次操作做了什么, 输入日志的方式可以
+        用选项 <option>--file</option> (<option>-F</option>) 或 <option>
+          --message</option> (<option>-m</option>), 如果这两个选项都没有指定,
+        客户端就会提示用户输入日志消息.</para>
       <para>Finally, there are a number of operations related to
         unversioned revision properties which can be performed

More information about the svnbook-dev mailing list