hgbook

changeset 700:d2aacc06e562

Add more paragraph IDs
author Bryan O'Sullivan <bos@serpentine.com>
date Sun May 03 20:27:28 2009 -0700 (2009-05-03)
parents a17d6390a480
children 477d6a3e5023
files en/ch01-tour-basic.xml en/ch02-tour-merge.xml
line diff
     1.1 --- a/en/ch01-tour-basic.xml	Sun May 03 20:27:09 2009 -0700
     1.2 +++ b/en/ch01-tour-basic.xml	Sun May 03 20:27:28 2009 -0700
     1.3 @@ -992,35 +992,35 @@
     1.4    <sect1>
     1.5      <title>Starting a new project</title>
     1.6  
     1.7 -    <para>It is just as easy to begin a new project as to work on one
     1.8 +    <para id="x_71c">It is just as easy to begin a new project as to work on one
     1.9        that already exists.  The <command>hg init</command> command
    1.10        creates a new, empty Mercurial repository.</para>
    1.11  
    1.12      &interaction.ch01-new.init;
    1.13  
    1.14 -    <para>This simply creates a repository named
    1.15 +    <para id="x_71d">This simply creates a repository named
    1.16        <filename>myproject</filename> in the current directory.</para>
    1.17  
    1.18      &interaction.ch01-new.ls;
    1.19  
    1.20 -    <para>We can tell that <filename>myproject</filename> is a
    1.21 +    <para id="x_71e">We can tell that <filename>myproject</filename> is a
    1.22        Mercurial repository, because it contains a
    1.23        <filename>.hg</filename> directory.</para>
    1.24  
    1.25      &interaction.ch01-new.ls2;
    1.26  
    1.27 -    <para>If we want to add some pre-existing files to the repository,
    1.28 +    <para id="x_71f">If we want to add some pre-existing files to the repository,
    1.29        we copy them into place, and tell Mercurial to start tracking
    1.30        them using the <command>hg add</command> command.</para>
    1.31  
    1.32      &interaction.ch01-new.add;
    1.33  
    1.34 -    <para>Once we are satisfied that our project looks right, we
    1.35 +    <para id="x_720">Once we are satisfied that our project looks right, we
    1.36        commit our changes.</para>
    1.37  
    1.38      &interaction.ch01-new.commit;
    1.39  
    1.40 -    <para>It takes just a few moments to start using Mercurial on a
    1.41 +    <para id="x_721">It takes just a few moments to start using Mercurial on a
    1.42        new project, which is part of its appeal. Revision control is
    1.43        now so easy to work with, we can use it on the smallest of
    1.44        projects that we might not have considered with a more
     2.1 --- a/en/ch02-tour-merge.xml	Sun May 03 20:27:09 2009 -0700
     2.2 +++ b/en/ch02-tour-merge.xml	Sun May 03 20:27:28 2009 -0700
     2.3 @@ -48,7 +48,7 @@
     2.4  
     2.5      &interaction.tour.merge.cat1;
     2.6  
     2.7 -    <para>And here is our slightly different version from the other
     2.8 +    <para id="x_722">And here is our slightly different version from the other
     2.9        repository.</para>
    2.10  
    2.11      &interaction.tour.merge.cat2;
    2.12 @@ -131,7 +131,7 @@
    2.13  	  -C</command> would revert any uncommitted changes in the
    2.14  	working directory.)</para>
    2.15  
    2.16 -      <para>To start a merge between the two heads, we use the
    2.17 +      <para id="x_723">To start a merge between the two heads, we use the
    2.18  	<command role="hg-cmd">hg merge</command> command.</para>
    2.19  
    2.20        &interaction.tour.merge.merge;
    2.21 @@ -355,7 +355,7 @@
    2.22        <note>
    2.23  	<title>Where is the <command>hg resolve</command> command?</title>
    2.24  
    2.25 -	<para>The <command>hg resolve</command> command was introduced
    2.26 +	<para id="x_724">The <command>hg resolve</command> command was introduced
    2.27  	  in Mercurial 1.1, which was released in December 2008. If
    2.28  	  you are using an older version of Mercurial (run <command>hg
    2.29  	    version</command> to see), this command will not be