hgbook
diff en/ch04-daily.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 | 6b7818eb3d8e |
children |
line diff
1.1 --- a/en/ch04-daily.xml Fri Apr 24 00:31:21 2009 -0700 1.2 +++ b/en/ch04-daily.xml Mon May 04 23:52:38 2009 -0700 1.3 @@ -108,10 +108,11 @@ 1.4 <sect1> 1.5 <title>How to stop tracking a file</title> 1.6 1.7 - <para id="x_1af">Once you decide that a file no longer belongs in your 1.8 - repository, use the <command role="hg-cmd">hg remove</command> 1.9 - command. This deletes the file, and tells Mercurial to stop 1.10 - tracking it. A removed file is represented in the output of 1.11 + <para id="x_1af">Once you decide that a file no longer belongs in 1.12 + your repository, use the <command role="hg-cmd">hg 1.13 + remove</command> command. This deletes the file, and tells 1.14 + Mercurial to stop tracking it (which will occur at the next 1.15 + commit). A removed file is represented in the output of 1.16 <command role="hg-cmd">hg status</command> with a 1.17 <quote><literal>R</literal></quote>.</para> 1.18 1.19 @@ -214,7 +215,7 @@ 1.20 </sect2> 1.21 </sect1> 1.22 1.23 - <sect1> 1.24 + <sect1 id="chap:daily.copy"> 1.25 <title>Copying files</title> 1.26 1.27 <para id="x_1bc">Mercurial provides a <command role="hg-cmd">hg 1.28 @@ -535,11 +536,12 @@ 1.29 <command role="hg-cmd">hg revert</command> to get rid of 1.30 erroneous changes to a file.</para> 1.31 1.32 - <para id="x_1e4">It's good to remember that the <command role="hg-cmd">hg 1.33 - revert</command> command is useful for changes that you have 1.34 - not yet committed. Once you've committed a change, if you 1.35 - decide it was a mistake, you can still do something about it, 1.36 - though your options may be more limited.</para> 1.37 + <para id="x_1e4">It is helpful to remember that the <command 1.38 + role="hg-cmd">hg revert</command> command is useful for 1.39 + changes that you have not yet committed. Once you've committed 1.40 + a change, if you decide it was a mistake, you can still do 1.41 + something about it, though your options may be more 1.42 + limited.</para> 1.43 1.44 <para id="x_1e5">For more information about the <command 1.45 role="hg-cmd">hg revert</command> command, and details about 1.46 @@ -817,7 +819,7 @@ 1.47 1.48 <para id="x_6d9">If you perform traditional backups of your master 1.49 repositories to tape or disk, and you want to back up a 1.50 - repository named <filename>myrepo</filename>. Use <command>hg 1.51 + repository named <filename>myrepo</filename>, use <command>hg 1.52 clone -U myrepo myrepo.bak</command> to create a 1.53 clone of <filename>myrepo</filename> before you start your 1.54 backups. The <option>-U</option> option doesn't check out a