[svnbook] r5541 committed - branches/1.8/zh/book/ ch04-branching-and-merging.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Wed Dec 13 05:52:36 CST 2017
Revision: 5541
http://sourceforge.net/p/svnbook/source/5541
Author: wuzhouhui
Date: 2017-12-13 11:52:35 +0000 (Wed, 13 Dec 2017)
Log Message:
-----------
1.8/zh: chapter 4 translated, but review needed
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-12-12 17:09:49 UTC (rev 5540)
+++ branches/1.8/zh/book/ch04-branching-and-merging.xml 2017-12-13 11:52:35 UTC (rev 5541)
@@ -7124,8 +7124,12 @@
<!-- ================================================================= -->
<!-- ================================================================= -->
<sect1 id="svn.branchmerge.summary">
+ <!--
<title>Summary</title>
+ -->
+ <title>小结</title>
+ <!--
<para>We covered a lot of ground in this chapter. We
discussed the concepts of tags and branches and demonstrated
how Subversion implements these concepts by copying directories
@@ -7136,101 +7140,171 @@
mixed-location working copies. And we talked about how one
might manage the organization and lifetimes of branches in a
repository.</para>
+ -->
+ <para>这一章我们讲了很多. 首先介绍了标签和分支的概念, 并说明了 Subversion
+ 如何通过 <command>svn copy</command> 复制目录来实现这两个功能. 然后展示
+ 了如何使用 <command>svn merge</command> 把修改从一个分支复制到另一个分支
+ 上, 或回退错误的修改. 再然后介绍了如何使用 <command>svn switch</command>
+ 创建具有混合位置的工作副本. 最后我们讨论了如何管理分支的组织与生存周期.
+ </para>
+ <!--
<para>Remember the Subversion mantra: branches and tags are cheap.
So don't be afraid to use them when needed!</para>
+ -->
+ <para>记住, Subversion 的分支和标签是很廉价的, 所以当你需要时请尽管使用!
+ </para>
+ <!--
<para>As a helpful reminder of all the operations we discussed,
here is handy reference table you can consult as
you begin to make use of branches.</para>
+ -->
+ <para>为了方便读者, 下面的表格总结了与分支有关的常见操作及其对应的命令.
+ </para>
<table id="svn.branchmerge.summary.tbl-1">
+ <!--
<title>Branching and merging commands</title>
+ -->
+ <title>分支与合并命令</title>
<tgroup cols="2">
<thead>
<row>
+ <!--
<entry>Action</entry>
<entry>Command</entry>
+ -->
+ <entry>操作</entry>
+ <entry>命令</entry>
</row>
</thead>
<tbody>
<row>
+ <!--
<entry>Create a branch or tag</entry>
+ -->
+ <entry>创建一个分支或标签</entry>
<entry><userinput>svn copy <replaceable>URL1</replaceable> <replaceable>URL2</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Switch a working copy to a branch or tag</entry>
+ -->
+ <entry>把工作副本切换到另一个分支或标签</entry>
<entry><userinput>svn switch <replaceable>URL</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Synchronize a branch with trunk</entry>
+ -->
+ <entry>将分支与主干同步</entry>
<entry><userinput>svn merge <replaceable>trunkURL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>See merge history or eligible changesets</entry>
+ -->
+ <entry>查看合并历史或可合并的变更集</entry>
<entry><userinput>svn mergeinfo <replaceable>SOURCE</replaceable> <replaceable>TARGET</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Merge a branch back into trunk</entry>
+ -->
+ <entry>将分支合并至主干</entry>
<entry><userinput>svn merge <replaceable>branchURL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>Merge one specific change</entry>
+ -->
+ <entry>合并一个特定的修改</entry>
<entry><userinput>svn merge -c <replaceable>REV</replaceable> <replaceable>URL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>Merge a range of changes</entry>
+ -->
+ <entry>合并一段范围的修改</entry>
<entry><userinput>svn merge -r <replaceable>REV1</replaceable>:<replaceable>REV2</replaceable> <replaceable>URL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>Block a change from automatic merging</entry>
+ -->
+ <entry>从自动合并中拦截某个特定的修改</entry>
<entry><userinput>svn merge -c <replaceable>REV</replaceable> --record-only <replaceable>URL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>Preview a merge</entry>
+ -->
+ <entry>合并预览</entry>
<entry><userinput>svn merge <replaceable>URL</replaceable> --dry-run</userinput></entry>
</row>
<row>
+ <!--
<entry>Abandon merge results</entry>
+ -->
+ <entry>放弃合并的结果</entry>
<entry><userinput>svn revert -R .</userinput></entry>
</row>
<row>
+ <!--
<entry>Resurrect something from history</entry>
+ -->
+ <entry>从历史中恢复文件</entry>
<entry><userinput>svn copy <replaceable>URL</replaceable>@<replaceable>REV</replaceable> <replaceable>localPATH</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Undo a committed change</entry>
+ -->
+ <entry>撤消已提交的修改</entry>
<entry><userinput>svn merge -c -<replaceable>REV</replaceable> <replaceable>URL</replaceable>; svn commit</userinput></entry>
</row>
<row>
+ <!--
<entry>Examine merge-sensitive history</entry>
+ -->
+ <entry>查看对合并敏感的历史</entry>
<entry><userinput>svn log -g; svn blame -g</userinput></entry>
</row>
<row>
+ <!--
<entry>Create a tag from a working copy</entry>
+ -->
+ <entry>从工作副本创建一个标签</entry>
<entry><userinput>svn copy . <replaceable>tagURL</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Rearrange a branch or tag</entry>
+ -->
+ <entry>重新安排分支或标签的布局</entry>
<entry><userinput>svn move <replaceable>URL1</replaceable> <replaceable>URL2</replaceable></userinput></entry>
</row>
<row>
+ <!--
<entry>Remove a branch or tag</entry>
+ -->
+ <entry>删除分支或标签</entry>
<entry><userinput>svn delete <replaceable>URL</replaceable></userinput></entry>
</row>
</tbody>
More information about the svnbook-dev
mailing list