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

[wuzhouhui at users.sourceforge.net]

Revision: 5343
          http://sourceforge.net/p/svnbook/source/5343
Author:   wuzhouhui
Date:     2017-07-01 07:46:20 +0000 (Sat, 01 Jul 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 3 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch03-advanced-topics.xml

Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml	2017-06-30 07:27:52 UTC (rev 5342)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml	2017-07-01 07:46:20 UTC (rev 5343)
@@ -468,13 +468,18 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.advanced.pegrevs">
+    <!--
     <title>Peg and Operative Revisions</title>
+    -->
+    <title>挂勾版本号与活动版本号</title>
 
+    <!--
     <para>We copy, move, rename, and completely replace files and
       directories on our computers all the time.  And your version
       control system shouldn't get in the way of your doing these
       things with your version-controlled files and directories,
       either.  Subversion's file management support is quite
+      TODO
       liberating, affording almost as much flexibility for versioned
       files as you'd expect when manipulating your unversioned ones.
       But that flexibility means that across the lifetime of your
@@ -483,7 +488,14 @@
       versioned objects.  This introduces a certain level of
       complexity to your interactions with those paths and
       objects.</para>
+    -->
+    <para>我们经常在自己的系统中对文件和目录进行复制, 移动, 重命名和替换,
+      但是版本控制系统不能按照相同的方式操作它所管理的文件与目录. Subversion
+      的文件管理非常灵活, 但是这种灵活性也意味着在仓库的生命周期中, 一个版本
+      控制对象可能会有多个路径, 而一个路径在不同时间可能表示完全不同的版本控制
+      对象, 当用户同这些路径与对象交互时会产生一定的复杂度.</para>
 
+    <!--
     <para>Subversion is pretty smart about noticing when an object's
       version history includes such <quote>changes of address.</quote>
       For example, if you ask for the revision history log of a
@@ -493,7 +505,14 @@
       and after that rename.  So, most of the time, you don't even
       have to think about such things.  But occasionally, Subversion
       needs your help to clear up ambiguities.</para>
+    -->
+    <para>如果对象的版本历史里包含了 "地址上的变化", Subversion 自己就会注意
+      到这点. 比如说用户要求查看上周被重命名的一个文件的版本历史, Subversion
+      会提供全部的相关日志—重命名发生时版本号, 再加上重命名前与重命名后
+      的相关版本号. 所以说在大部分情况下, 用户都不需要考虑对象的地址变化可能
+      带来的影响, 但是在少数情况下, Subversion 需要你的帮助来消除歧义.</para>
 
+    <!--
     <para>The simplest example of this occurs when a directory or file
       is deleted from version control, and then a new directory or
       file is created with the same name and added to version control.
@@ -507,7 +526,16 @@
       have happened to <emphasis>all</emphasis> the objects that have
       ever lived at that path?  Subversion needs a hint about what you
       really want.</para>
+    -->
+    <para>最简单的一种场景是一个文件或目录从仓库中被删除后, 又有一个同名的
+      文件或目录被添加到仓库中, 被删除的对象和新增的对象之间毫无关系, 只是
+      碰巧路径相同, 假设都是 <filename>/trunk/object</filename>, 那么向
+      Subversion 询问 <filename>/trunk/object</filename> 的历史是表示什么
+      意思? 是在问当前对象的历史, 还是那个被删除的对象的历史? 或者是在问
+      该路径上存在过的 <emphasis>所有</emphasis> 对象的操作历史? 为了得到
+      自己想要的信息, Subversion 需要一些提示.</para>
 
+    <!--
     <para>And thanks to moves, versioned object history can get far
       more twisted than even that.  For example, you might have a
       directory named <filename>concept</filename>, containing some
@@ -524,6 +552,16 @@
       Frabnaggilywort releases a 1.0 version and is downloaded and
       used daily by hordes of people aiming to improve their
       lives.</para>
+    -->
+    <para>由于移动操作, 对象的历史变得更加复杂. 比如说你有一个目录叫作
+      <filename>concept</filename>, 它包含了几个初期的软件项目. 慢慢地,
+      软件开始成型, 你开始考虑为项目取一个名字<footnote><para><quote>
+            You're not supposed to name it. Once you name it, you start
+            getting attached to it.</quote>—Mike Wazowski</para>
+      </footnote>. 假设你要取的软件名字是 Frabnaggilywort, 把目录重命名成
+      软件的名字是很合理的操作, 于是 <filename>concept</filename> 被重命名
+      为 <filename>frabnaggilywort</filename>. 开始接着进行, Frabnaggilywort
+      发布了 1.0 版, 很多用户都下载了并在日常工作中使用它.</para>
     
     <para>It's a nice story, really, but it doesn't end there.
       Entrepreneur that you are, you've already got another think in