Mercurial > hgbook
changeset 827:d2aacc06e562
Add more paragraph IDs
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sun, 03 May 2009 20:27:28 -0700 |
parents | a17d6390a480 |
children | 477d6a3e5023 |
files | en/ch01-tour-basic.xml en/ch02-tour-merge.xml |
diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/en/ch01-tour-basic.xml Sun May 03 20:27:09 2009 -0700 +++ b/en/ch01-tour-basic.xml Sun May 03 20:27:28 2009 -0700 @@ -992,35 +992,35 @@ <sect1> <title>Starting a new project</title> - <para>It is just as easy to begin a new project as to work on one + <para id="x_71c">It is just as easy to begin a new project as to work on one that already exists. The <command>hg init</command> command creates a new, empty Mercurial repository.</para> &interaction.ch01-new.init; - <para>This simply creates a repository named + <para id="x_71d">This simply creates a repository named <filename>myproject</filename> in the current directory.</para> &interaction.ch01-new.ls; - <para>We can tell that <filename>myproject</filename> is a + <para id="x_71e">We can tell that <filename>myproject</filename> is a Mercurial repository, because it contains a <filename>.hg</filename> directory.</para> &interaction.ch01-new.ls2; - <para>If we want to add some pre-existing files to the repository, + <para id="x_71f">If we want to add some pre-existing files to the repository, we copy them into place, and tell Mercurial to start tracking them using the <command>hg add</command> command.</para> &interaction.ch01-new.add; - <para>Once we are satisfied that our project looks right, we + <para id="x_720">Once we are satisfied that our project looks right, we commit our changes.</para> &interaction.ch01-new.commit; - <para>It takes just a few moments to start using Mercurial on a + <para id="x_721">It takes just a few moments to start using Mercurial on a new project, which is part of its appeal. Revision control is now so easy to work with, we can use it on the smallest of projects that we might not have considered with a more
--- a/en/ch02-tour-merge.xml Sun May 03 20:27:09 2009 -0700 +++ b/en/ch02-tour-merge.xml Sun May 03 20:27:28 2009 -0700 @@ -48,7 +48,7 @@ &interaction.tour.merge.cat1; - <para>And here is our slightly different version from the other + <para id="x_722">And here is our slightly different version from the other repository.</para> &interaction.tour.merge.cat2; @@ -131,7 +131,7 @@ -C</command> would revert any uncommitted changes in the working directory.)</para> - <para>To start a merge between the two heads, we use the + <para id="x_723">To start a merge between the two heads, we use the <command role="hg-cmd">hg merge</command> command.</para> &interaction.tour.merge.merge; @@ -355,7 +355,7 @@ <note> <title>Where is the <command>hg resolve</command> command?</title> - <para>The <command>hg resolve</command> command was introduced + <para id="x_724">The <command>hg resolve</command> command was introduced in Mercurial 1.1, which was released in December 2008. If you are using an older version of Mercurial (run <command>hg version</command> to see), this command will not be