1. Mike Shi
  2. hgbook-zh


tr  committed 84811be

Slight changes to see if commit is OK

  • Participants
  • Parent commits 189d8d5
  • Branches default

Comments (0)

Files changed (1)

File zh/ch01-intro.xml

View file
-      <para id="x_95">如果任何时候,任何人参与的工作,其实都是在创建和合并
-        分支,那么,开源世界里所谓的<quote>创建分支</quote>,就完全是一个社
-        会学上的概念了。
-        If every piece of work that everybody does, all the
-        time, is framed in terms of forking and merging, then what
-        the open source world refers to as a <quote>fork</quote>
-        becomes <emphasis>purely</emphasis> a social issue.  If
-        anything, distributed tools <emphasis>lower</emphasis> the
-        likelihood of a fork:</para>
+      <para id="x_95">如果每个人在任何时候所做的任何工作,都可以纳入分支、合并的范畴,那么开源世界所谓的<quote>分支</quote>就<emphasis>纯粹</emphasis>是一个社区化的事件。真要说起来的话,分布式工具<emphasis>减弱</emphasis>了分支的可能性:</para>
-        <listitem><para id="x_96">They eliminate the social distinction that
-            centralised tools impose: that between insiders (people
-            with commit access) and outsiders (people
-            without).</para></listitem>
-        <listitem><para id="x_97">They make it easier to reconcile after a
-            social fork, because all that's involved from the
-            perspective of the revision control software is just
-            another merge.</para></listitem></itemizedlist>
+        <listitem><para id="x_96">它们消除了中心化工具所带来的社区地位的分别:所谓的圈内人(有提交权限)和圈外人(没有提交权限)间的区别。</para></listitem>
+        <listitem><para id="x_97">它们使得社区进行分支后的归一变得更简单,因为从版本控制系统软件的角度来看,所牵涉到的一切不过是又一次合并。</para></listitem></itemizedlist>
       <para id="x_98">Some people resist distributed tools because they want
         to retain tight control over their projects, and they