hgbook
diff en/ch07-branch.xml @ 701:477d6a3e5023
Many final changes.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon May 04 23:52:38 2009 -0700 (2009-05-04) |
parents | e6c99cbd0abd |
children |
line diff
1.1 --- a/en/ch07-branch.xml Thu Apr 16 23:45:07 2009 -0700 1.2 +++ b/en/ch07-branch.xml Mon May 04 23:52:38 2009 -0700 1.3 @@ -183,15 +183,15 @@ 1.4 after the revision you specified. This has an interaction 1.5 with tags that can surprise the unwary.</para> 1.6 1.7 - <para id="x_381">Recall that a tag is stored as a revision to the <filename 1.8 - role="special">.hgtags</filename> file, so that when you 1.9 - create a tag, the changeset in which it's recorded necessarily 1.10 - refers to an older changeset. When you run <command 1.11 - role="hg-cmd">hg clone -r foo</command> to clone a 1.12 - repository as of tag <literal>foo</literal>, the new clone 1.13 - <emphasis>will not contain the history that created the 1.14 - tag</emphasis> that you used to clone the repository. The 1.15 - result is that you'll get exactly the right subset of the 1.16 + <para id="x_381">Recall that a tag is stored as a revision to 1.17 + the <filename role="special">.hgtags</filename> file. When you 1.18 + create a tag, the changeset in which its recorded refers to an 1.19 + older changeset. When you run <command role="hg-cmd">hg clone 1.20 + -r foo</command> to clone a repository as of tag 1.21 + <literal>foo</literal>, the new clone <emphasis>will not 1.22 + contain any revision newer than the one the tag refers to, 1.23 + including the revision where the tag was created</emphasis>. 1.24 + The result is that you'll get exactly the right subset of the 1.25 project's history in the new repository, but 1.26 <emphasis>not</emphasis> the tag you might have 1.27 expected.</para> 1.28 @@ -227,9 +227,10 @@ 1.29 <sect1> 1.30 <title>The flow of changes&emdash;big picture vs. little</title> 1.31 1.32 - <para id="x_384">To return to the outline I sketched at the beginning of a 1.33 - chapter, let's think about a project that has multiple 1.34 - concurrent pieces of work under development at once.</para> 1.35 + <para id="x_384">To return to the outline I sketched at the 1.36 + beginning of the chapter, let's think about a project that has 1.37 + multiple concurrent pieces of work under development at 1.38 + once.</para> 1.39 1.40 <para id="x_385">There might be a push for a new <quote>main</quote> release; 1.41 a new minor bugfix release to the last main release; and an 1.42 @@ -416,7 +417,7 @@ 1.43 1.44 <para id="x_39e">If you have more than one named branch in a repository, 1.45 Mercurial will remember the branch that your working directory 1.46 - on when you start a command like <command role="hg-cmd">hg 1.47 + is on when you start a command like <command role="hg-cmd">hg 1.48 update</command> or <command role="hg-cmd">hg pull 1.49 -u</command>. It will update the working directory to the tip 1.50 of this branch, no matter what the <quote>repo-wide</quote> tip