hgbook

diff en/ch01-tour-basic.xml @ 699:a17d6390a480

More fixes to chapters 1 and 2.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun May 03 20:27:09 2009 -0700 (2009-05-03)
parents d7d09cda83d2
children d2aacc06e562
line diff
     1.1 --- a/en/ch01-tour-basic.xml	Sun May 03 19:23:31 2009 -0700
     1.2 +++ b/en/ch01-tour-basic.xml	Sun May 03 20:27:09 2009 -0700
     1.3 @@ -867,9 +867,7 @@
     1.4  	    linkend="sec:tour:pull"/> when we ran it without <option
     1.5  	  role="hg-opt-pull">-u</option>, you can see that it printed
     1.6  	a helpful reminder that we'd have to take an explicit step to
     1.7 -	update the working directory:</para>
     1.8 -
     1.9 -      <!-- &interaction.xxx.fixme; -->
    1.10 +	update the working directory.</para>
    1.11  
    1.12        <para id="x_62">To find out what revision the working directory
    1.13  	is at, use the <command role="hg-cmd">hg parents</command>
    1.14 @@ -990,6 +988,44 @@
    1.15        &interaction.tour.push.net;
    1.16      </sect2>
    1.17    </sect1>
    1.18 +
    1.19 +  <sect1>
    1.20 +    <title>Starting a new project</title>
    1.21 +
    1.22 +    <para>It is just as easy to begin a new project as to work on one
    1.23 +      that already exists.  The <command>hg init</command> command
    1.24 +      creates a new, empty Mercurial repository.</para>
    1.25 +
    1.26 +    &interaction.ch01-new.init;
    1.27 +
    1.28 +    <para>This simply creates a repository named
    1.29 +      <filename>myproject</filename> in the current directory.</para>
    1.30 +
    1.31 +    &interaction.ch01-new.ls;
    1.32 +
    1.33 +    <para>We can tell that <filename>myproject</filename> is a
    1.34 +      Mercurial repository, because it contains a
    1.35 +      <filename>.hg</filename> directory.</para>
    1.36 +
    1.37 +    &interaction.ch01-new.ls2;
    1.38 +
    1.39 +    <para>If we want to add some pre-existing files to the repository,
    1.40 +      we copy them into place, and tell Mercurial to start tracking
    1.41 +      them using the <command>hg add</command> command.</para>
    1.42 +
    1.43 +    &interaction.ch01-new.add;
    1.44 +
    1.45 +    <para>Once we are satisfied that our project looks right, we
    1.46 +      commit our changes.</para>
    1.47 +
    1.48 +    &interaction.ch01-new.commit;
    1.49 +
    1.50 +    <para>It takes just a few moments to start using Mercurial on a
    1.51 +      new project, which is part of its appeal. Revision control is
    1.52 +      now so easy to work with, we can use it on the smallest of
    1.53 +      projects that we might not have considered with a more
    1.54 +      complicated tool.</para>
    1.55 +  </sect1>
    1.56  </chapter>
    1.57  
    1.58  <!--