hgbook
diff en/ch03-tour-merge.xml @ 567:8fcd44708f41
Uncomment all the mangled interaction examples.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 23:22:09 2009 -0700 (2009-03-09) |
parents | b90b024729f1 |
children | 13513d2a128d |
line diff
1.1 --- a/en/ch03-tour-merge.xml Wed Feb 18 00:22:09 2009 -0800 1.2 +++ b/en/ch03-tour-merge.xml Mon Mar 09 23:22:09 2009 -0700 1.3 @@ -31,7 +31,7 @@ 1.4 begin by cloning yet another repository (see how often they 1.5 spring up?) and making a change in it.</para> 1.6 1.7 - <!-- &interaction.tour.merge.clone; --> 1.8 + &interaction.tour.merge.clone; 1.9 1.10 <para>We should now have two copies of 1.11 <filename>hello.c</filename> with different contents. The 1.12 @@ -39,7 +39,7 @@ 1.13 illustrated in figure <xref 1.14 linkend="fig:tour-merge:sep-repos"/>.</para> 1.15 1.16 - <!-- &interaction.tour.merge.cat; --> 1.17 + &interaction.tour.merge.cat; 1.18 1.19 <informalfigure id="fig:tour-merge:sep-repos"> 1.20 <mediaobject> 1.21 @@ -56,7 +56,7 @@ 1.22 class="directory">my-hello</filename> repository will have no 1.23 effect on the working directory.</para> 1.24 1.25 - <!-- &interaction.tour.merge.pull; --> 1.26 + &interaction.tour.merge.pull; 1.27 1.28 <para>However, the <command role="hg-cmd">hg pull</command> 1.29 command says something about <quote>heads</quote>.</para> 1.30 @@ -96,7 +96,7 @@ 1.31 We can view the heads in a repository using the <command 1.32 role="hg-cmd">hg heads</command> command.</para> 1.33 1.34 - <!-- &interaction.tour.merge.heads; --> 1.35 + &interaction.tour.merge.heads; 1.36 1.37 </sect2> 1.38 <sect2> 1.39 @@ -106,7 +106,7 @@ 1.40 role="hg-cmd">hg update</command> command to update to the 1.41 new tip?</para> 1.42 1.43 - <!-- &interaction.tour.merge.update; --> 1.44 + &interaction.tour.merge.update; 1.45 1.46 <para>Mercurial is telling us that the <command role="hg-cmd">hg 1.47 update</command> command won't do a merge; it won't update 1.48 @@ -115,7 +115,7 @@ 1.49 <command role="hg-cmd">hg merge</command> command to merge the 1.50 two heads.</para> 1.51 1.52 - <!-- &interaction.tour.merge.merge; --> 1.53 + &interaction.tour.merge.merge; 1.54 1.55 <informalfigure id="fig:tour-merge:merge"> 1.56 1.57 @@ -133,7 +133,7 @@ 1.58 parents</command> and the contents of 1.59 <filename>hello.c</filename>.</para> 1.60 1.61 - <!-- &interaction.tour.merge.parents; --> 1.62 + &interaction.tour.merge.parents; 1.63 1.64 </sect2> 1.65 <sect2> 1.66 @@ -144,14 +144,14 @@ 1.67 role="hg-cmd">hg commit</command> the results of the 1.68 merge.</para> 1.69 1.70 - <!-- &interaction.tour.merge.commit; --> 1.71 + &interaction.tour.merge.commit; 1.72 1.73 <para>We now have a new tip revision; notice that it has 1.74 <emphasis>both</emphasis> of our former heads as its parents. 1.75 These are the same revisions that were previously displayed by 1.76 <command role="hg-cmd">hg parents</command>.</para> 1.77 1.78 - <!-- &interaction.tour.merge.tip; --> 1.79 + &interaction.tour.merge.tip; 1.80 1.81 <para>In figure <xref 1.82 linkend="fig:tour-merge:merge"/>, you can see a 1.83 @@ -273,12 +273,12 @@ 1.84 above. Let's begin by creating a repository with a base 1.85 version of our document.</para> 1.86 1.87 - <!-- &interaction.tour-merge-conflict.wife; --> 1.88 + &interaction.tour-merge-conflict.wife; 1.89 1.90 <para>We'll clone the repository and make a change to the 1.91 file.</para> 1.92 1.93 - <!-- &interaction.tour-merge-conflict.cousin; --> 1.94 + &interaction.tour-merge-conflict.cousin; 1.95 1.96 <para>And another clone, to simulate someone else making a 1.97 change to the file. (This hints at the idea that it's not all 1.98 @@ -286,13 +286,13 @@ 1.99 separate repositories, and indeed to find and resolve 1.100 conflicts while doing so.)</para> 1.101 1.102 - <!-- &interaction.tour-merge-conflict.son; --> 1.103 + &interaction.tour-merge-conflict.son; 1.104 1.105 <para>Having created two 1.106 different versions of the file, we'll set up an environment 1.107 suitable for running our merge.</para> 1.108 1.109 - <!-- &interaction.tour-merge-conflict.pull; --> 1.110 + &interaction.tour-merge-conflict.pull; 1.111 1.112 <para>In this example, I won't use Mercurial's normal 1.113 <command>hgmerge</command> program to do the merge, because it 1.114 @@ -307,7 +307,7 @@ 1.115 <para><emphasis role="bold">XXX FIX THIS 1.116 EXAMPLE.</emphasis></para> 1.117 1.118 - <!-- &interaction.tour-merge-conflict.merge; --> 1.119 + &interaction.tour-merge-conflict.merge; 1.120 1.121 <para>Because <command>merge</command> can't resolve the 1.122 conflicting changes, it leaves <emphasis>merge 1.123 @@ -326,7 +326,7 @@ 1.124 prevent us from <quote>fixing up</quote> the affected files 1.125 ourselves, and committing the results of our merge:</para> 1.126 1.127 - <!-- &interaction.tour-merge-conflict.commit; --> 1.128 + &interaction.tour-merge-conflict.commit; 1.129 1.130 </sect2> 1.131 </sect1>