# HG changeset patch # User Bryan O'Sullivan # Date 1241407648 25200 # Node ID d2aacc06e562b175c4b1f8ac1d226255630d4bc4 # Parent a17d6390a48052b4360edca53a98978b4c660fef Add more paragraph IDs diff -r a17d6390a480 -r d2aacc06e562 en/ch01-tour-basic.xml --- 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 @@ Starting a new project - It is just as easy to begin a new project as to work on one + It is just as easy to begin a new project as to work on one that already exists. The hg init command creates a new, empty Mercurial repository. &interaction.ch01-new.init; - This simply creates a repository named + This simply creates a repository named myproject in the current directory. &interaction.ch01-new.ls; - We can tell that myproject is a + We can tell that myproject is a Mercurial repository, because it contains a .hg directory. &interaction.ch01-new.ls2; - If we want to add some pre-existing files to the repository, + 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 hg add command. &interaction.ch01-new.add; - Once we are satisfied that our project looks right, we + Once we are satisfied that our project looks right, we commit our changes. &interaction.ch01-new.commit; - It takes just a few moments to start using Mercurial on a + 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 diff -r a17d6390a480 -r d2aacc06e562 en/ch02-tour-merge.xml --- 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; - And here is our slightly different version from the other + And here is our slightly different version from the other repository. &interaction.tour.merge.cat2; @@ -131,7 +131,7 @@ -C would revert any uncommitted changes in the working directory.) - To start a merge between the two heads, we use the + To start a merge between the two heads, we use the hg merge command. &interaction.tour.merge.merge; @@ -355,7 +355,7 @@ Where is the <command>hg resolve</command> command? - The hg resolve command was introduced + The hg resolve command was introduced in Mercurial 1.1, which was released in December 2008. If you are using an older version of Mercurial (run hg version to see), this command will not be