Commits

Mike Shi committed bfcb3e6

开始翻译《创建变更和复核变更》

Comments (0)

Files changed (1)

zh/ch02-tour-basic.xml

 
   </sect1>
   <sect1>
-    <title>Making and reviewing changes</title>
+    <title>创建变更和复核变更</title>
 
-    <para id="x_38">Now that we have a grasp of viewing history in Mercurial,
-      let's take a look at making some changes and examining
-      them.</para>
+    <para id="x_38">现在我们已经有了有能力查看Mercurial中的历史了,让我们
+      来试着创建一些变更并测试一下它们吧。</para>
 
-    <para id="x_39">The first thing we'll do is isolate our experiment in a
-      repository of its own.  We use the <command role="hg-cmd">hg
-	clone</command> command, but we don't need to clone a copy of
-      the remote repository.  Since we already have a copy of it
-      locally, we can just clone that instead.  This is much faster
-      than cloning over the network, and cloning a local repository
-      uses less disk space in most cases, too<footnote>
-	<para id="x_681">The saving of space arises when source and destination
-	  repositories are on the same filesystem, in which case
-	  Mercurial will use hardlinks to do copy-on-write sharing of
-	  its internal metadata.  If that explanation meant nothing to
-	  you, don't worry: everything happens transparently and
-	  automatically, and you don't need to understand it.</para>
-	</footnote>.</para>
+    <para id="x_39">首先我们要隔离我们将要进行试验的仓库。我们使用<command
+      role="hg-cmd">hg clone</command>命令来创建,不过呢,既然我们已经有
+      一个本地的复本了,就不用再从远程仓库来复制了,我们只要复制本地的那个
+      就行了。这要比通过网络复制快多了,而且本地复制通常会占用更少的空间。
+      <footnote><para id="x_681">如果源仓库和目标仓库在同一个文件系统下,
+      会节省空间,因为Mercurial会使用硬链接来对它的内部元数据做一个写入时
+      复制的共享。如果这个解释让你云里雾里的,也不要担心:所有的一切都是
+      透明且自动的,你无需理解它们。</para>
 
     &interaction.tour.reclone;
 
-    <para id="x_3a">As an aside, it's often good practice to keep a
-      <quote>pristine</quote> copy of a remote repository around,
-      which you can then make temporary clones of to create sandboxes
-      for each task you want to work on.  This lets you work on
-      multiple tasks in parallel, each isolated from the others until
-      it's complete and you're ready to integrate it back.  Because
-      local clones are so cheap, there's almost no overhead to cloning
-      and destroying repositories whenever you want.</para>
+    <para id="x_3a">顺便提一下,保留一份远程仓库<quote>纯净的</quote>复本
+      通常是个不错的主意,这让你可以随时创建一个临时的复本作为每个任务的
+      沙盒。这样你可以并行的在多个任务上工作,在你完成了任务并准备把它们整
+      合回去之前,每个都是和其他隔离的。因为创建一个本地复本非常简单,这基
+      本不过让你在随时创建复本和销毁复本这件事上感到任何负担。</para>
 
-    <para id="x_3b">In our <filename class="directory">my-hello</filename>
-      repository, we have a file <filename>hello.c</filename> that
-      contains the classic <quote>hello, world</quote> program.</para>
+    <para id="x_3b">在我们的<filename class="directory">my-hello</filename>
+      仓库中,我们已经有了一个包含了经典的<quote>hello, world</quote>程序的
+      文件<filename>hello.c</filename>。</para>
 
     &interaction.tour.cat1;
 
-    <para id="x_682">Let's edit this file so that it prints a second line of
-      output.</para>
+    <para id="x_682">让我们开始编辑这个文件来让它打印第二行输出吧。</para>
 
     &interaction.tour.cat2;
 
-    <para id="x_3c">Mercurial's <command role="hg-cmd">hg status</command>
-      command will tell us what Mercurial knows about the files in the
-      repository.</para>
+    <para id="x_3c">Mercurial的<command role="hg-cmd">hg status</command>
+      命令会告诉我们Mercurial所知道的仓库里的文件有哪些。</para>
 
     &interaction.tour.status;