[svnbook] r5503 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Mon Nov 20 06:46:38 CST 2017


Revision: 5503
          http://sourceforge.net/p/svnbook/source/5503
Author:   wuzhouhui
Date:     2017-11-20 12:46:37 +0000 (Mon, 20 Nov 2017)
Log Message:
-----------
1.8/zh: translation of chapter 4 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch04-branching-and-merging.xml

Modified: branches/1.8/zh/book/ch04-branching-and-merging.xml
===================================================================
--- branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-19 12:47:58 UTC (rev 5502)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml	2017-11-20 12:46:37 UTC (rev 5503)
@@ -5483,8 +5483,12 @@
   <!-- ================================================================= -->
   <!-- ================================================================= -->
   <sect1 id="svn.branchmerge.maint">
+      <!--
     <title>Branch Maintenance</title>
+      -->
+    <title>分支维护</title>
 
+      <!--
     <para>You may have noticed by now that Subversion is extremely
       flexible.  Because it implements branches and tags with the same
       underlying mechanism (directory copies), and because branches
@@ -5492,11 +5496,20 @@
       Subversion intimidating.  It's almost <emphasis>too</emphasis>
       flexible.  In this section, we'll offer some suggestions for
       arranging and managing your data over time.</para>
+      -->
+    <para>读者可能已经注意到 Subversion 非常灵活. 因为 Subversion 实现分支和
+      标签的底层机制是相同的 (目录复制), 而且分支和标签都是以普通的目录出现
+      在文件系统中, 很多人觉得自己被 Subversion 吓到了: 这简直就是
+      <emphasis>过于</emphasis> 灵活了. 本节将介绍一些与管理相关的建议.</para>
 
     <!-- =============================================================== -->
     <sect2 id="svn.branchmerge.maint.layout">
+      <!--
       <title>Repository Layout</title>
+      -->
+      <title>仓库布局</title>
 
+      <!--
       <para>There are some standard, recommended ways to organize the
         contents of a repository.  Most people create a
         <filename>trunk</filename> directory to hold the <quote>main
@@ -5505,6 +5518,11 @@
         a <filename>tags</filename> directory to contain tag copies.
         If a repository holds only one project, often people create
         these top-level directories:</para>
+      -->
+      <para>有一些标准的方式用于组织仓库内容. 大多数用户用目录 <filename>trunk
+          </filename> 存放开发 <quote>主线</quote>, 用目录 <filename>branches
+        </filename> 存放分支, 用目录 <filename>tags</filename> 存放标签. 如果
+        一个仓库只存放一个项目, 人们通常会创建这些顶层目录:</para>
 
       <informalexample>
         <literallayout>
@@ -5515,11 +5533,17 @@
 </literallayout>
       </informalexample>
 
+      <!--
       <para>If a repository contains multiple projects, admins
         typically index their layout by project.  See <xref
         linkend="svn.reposadmin.projects.chooselayout"/> to read more about
         <quote>project roots</quote>, but here's an example of such a
         layout:</para>
+      -->
+      <para>如果在一个仓库中包含了多个项目, 通常根据项目索引它们的布局, 关
+        于 <quote>项目根目录</quote> 的更多内容, 见 <xref
+          linkend="svn.reposadmin.projects.chooselayout"/>, 下面就是一个典型的,
+        包含了多个项目的仓库布局:</para>
 
       <informalexample>
         <literallayout>
@@ -5535,6 +5559,7 @@
 </literallayout>
       </informalexample>
 
+      <!--
       <para>Of course, you're free to ignore these common layouts.
         You can create any sort of variation, whatever works best for
         you or your team.  Remember that whatever you choose, it's not
@@ -5545,6 +5570,13 @@
         is just a matter of issuing a series of server-side moves; if
         you don't like the way things are organized in the repository,
         just juggle the directories around.</para>
+      -->
+      <para>当然, 用户也可以完全忽略这些常见的布局, 按照实际需要定义仓库的
+        布局. 记住, 无论你怎么选择, 仓库布局并非一成不变, 用户可以在任何时候
+        重新组织仓库的布局. 因为分支和标签都是普通目录, 所以用户可以随心所欲地
+        用命令 <command>svn move</command> 移动或重命名它们. 从一种布局切换到
+        另一种布局只是服务器端的一系列移动而已, 如果你不喜欢当前的仓库布局,
+        要以任意修改目录结构.</para>
 
       <para>Remember, though, that while moving directories is
         easy to do, you need to be considerate of other users as well.




More information about the svnbook-dev mailing list