comparison en/ch02-tour-merge.xml @ 690:b788b405e141

Replace uses of <informalfigure> with <figure>
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 26 Mar 2009 21:07:39 -0700
parents c838b3975bc6
children 4ce9d0754af3
comparison
equal deleted inserted replaced
689:a2923aa93da9 690:b788b405e141
40 illustrated in figure <xref 40 illustrated in figure <xref
41 linkend="fig:tour-merge:sep-repos"/>.</para> 41 linkend="fig:tour-merge:sep-repos"/>.</para>
42 42
43 &interaction.tour.merge.cat; 43 &interaction.tour.merge.cat;
44 44
45 <informalfigure id="fig:tour-merge:sep-repos"> 45 <figure id="fig:tour-merge:sep-repos">
46 <title>Divergent recent histories of the <filename
47 class="directory">my-hello</filename> and <filename
48 class="directory">my-new-hello</filename>
49 repositories</title>
46 <mediaobject> 50 <mediaobject>
47 <imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject> 51 <imageobject><imagedata fileref="tour-merge-sep-repos"/></imageobject>
48 <textobject><phrase>XXX add text</phrase></textobject> 52 <textobject><phrase>XXX add text</phrase></textobject>
49 <caption><para id="x_33e">Divergent recent histories of the <filename
50 class="directory">my-hello</filename> and <filename
51 class="directory">my-new-hello</filename>
52 repositories</para></caption>
53 </mediaobject> 53 </mediaobject>
54 </informalfigure> 54 </figure>
55 55
56 <para id="x_33f">We already know that pulling changes from our <filename 56 <para id="x_33f">We already know that pulling changes from our <filename
57 class="directory">my-hello</filename> repository will have no 57 class="directory">my-hello</filename> repository will have no
58 effect on the working directory.</para> 58 effect on the working directory.</para>
59 59
69 as they're also known. The tip revision is thus a head, 69 as they're also known. The tip revision is thus a head,
70 because the newest revision in a repository doesn't have any 70 because the newest revision in a repository doesn't have any
71 children, but a repository can contain more than one 71 children, but a repository can contain more than one
72 head.</para> 72 head.</para>
73 73
74 <informalfigure id="fig:tour-merge:pull"> 74 <figure id="fig:tour-merge:pull">
75 <mediaobject><imageobject><imagedata 75 <title>Repository contents after pulling from <filename
76 fileref="tour-merge-pull"/></imageobject><textobject><phrase>XXX 76 class="directory">my-hello</filename> into <filename
77 add text</phrase></textobject> 77 class="directory">my-new-hello</filename></title>
78 <caption><para id="x_342">Repository contents after pulling from 78 <mediaobject>
79 <filename class="directory">my-hello</filename> into 79 <imageobject>
80 <filename 80 <imagedata fileref="tour-merge-pull"/>
81 class="directory">my-new-hello</filename></para></caption> 81 </imageobject>
82 <textobject><phrase>XXX add text</phrase></textobject>
82 </mediaobject> 83 </mediaobject>
83 </informalfigure> 84 </figure>
84 85
85 <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can 86 <para id="x_343">In figure <xref linkend="fig:tour-merge:pull"/>, you can
86 see the effect of the pull from <filename 87 see the effect of the pull from <filename
87 class="directory">my-hello</filename> into <filename 88 class="directory">my-hello</filename> into <filename
88 class="directory">my-new-hello</filename>. The history that 89 class="directory">my-new-hello</filename>. The history that
116 <command role="hg-cmd">hg merge</command> command to merge the 117 <command role="hg-cmd">hg merge</command> command to merge the
117 two heads.</para> 118 two heads.</para>
118 119
119 &interaction.tour.merge.merge; 120 &interaction.tour.merge.merge;
120 121
121 <informalfigure id="fig:tour-merge:merge"> 122 <figure id="fig:tour-merge:merge">
122 123 <title>Working directory and repository during merge, and
123 <mediaobject><imageobject><imagedata 124 following commit</title>
124 fileref="tour-merge-merge"/></imageobject><textobject><phrase>XXX 125 <mediaobject>
125 add text</phrase></textobject> 126 <imageobject>
126 <caption><para id="x_346">Working directory and repository during 127 <imagedata fileref="tour-merge-merge"/>
127 merge, and following commit</para></caption> 128 </imageobject>
129 <textobject><phrase>XXX add text</phrase></textobject>
128 </mediaobject> 130 </mediaobject>
129 </informalfigure> 131 </figure>
130 132
131 <para id="x_347">This updates the working directory so that it contains 133 <para id="x_347">This updates the working directory so that it contains
132 changes from <emphasis>both</emphasis> heads, which is 134 changes from <emphasis>both</emphasis> heads, which is
133 reflected in both the output of <command role="hg-cmd">hg 135 reflected in both the output of <command role="hg-cmd">hg
134 parents</command> and the contents of 136 parents</command> and the contents of
172 of the same files. Unless both modifications are identical, 174 of the same files. Unless both modifications are identical,
173 this results in a <emphasis>conflict</emphasis>, where you have 175 this results in a <emphasis>conflict</emphasis>, where you have
174 to decide how to reconcile the different changes into something 176 to decide how to reconcile the different changes into something
175 coherent.</para> 177 coherent.</para>
176 178
177 <informalfigure> 179 <figure id="fig:tour-merge:conflict">
178 180 <title>Conflicting changes to a document</title>
179 <mediaobject id="fig:tour-merge:conflict"> 181 <mediaobject>
180 <imageobject><imagedata fileref="tour-merge-conflict"/></imageobject> 182 <imageobject><imagedata fileref="tour-merge-conflict"/></imageobject>
181 <textobject><phrase>XXX add text</phrase></textobject> 183 <textobject><phrase>XXX add text</phrase></textobject>
182 <caption><para id="x_34c">Conflicting changes to a 184 </mediaobject>
183 document</para></caption> </mediaobject> 185 </figure>
184 </informalfigure>
185 186
186 <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates 187 <para id="x_34d">Figure <xref linkend="fig:tour-merge:conflict"/> illustrates
187 an instance of two conflicting changes to a document. We 188 an instance of two conflicting changes to a document. We
188 started with a single version of the file; then we made some 189 started with a single version of the file; then we made some
189 changes; while someone else made different changes to the same 190 changes; while someone else made different changes to the same
241 <para id="x_355">All four of these panes are <emphasis>locked 242 <para id="x_355">All four of these panes are <emphasis>locked
242 together</emphasis>; if we scroll vertically or horizontally 243 together</emphasis>; if we scroll vertically or horizontally
243 in any of them, the others are updated to display the 244 in any of them, the others are updated to display the
244 corresponding sections of their respective files.</para> 245 corresponding sections of their respective files.</para>
245 246
246 <informalfigure id="fig:tour-merge:kdiff3"> 247 <figure id="fig:tour-merge:kdiff3">
247 <mediaobject><imageobject><imagedata 248 <title>Using <command>kdiff3</command> to merge versions of a
248 fileref="kdiff3"/></imageobject><textobject><phrase>XXX 249 file</title>
249 add text</phrase></textobject> 250 <mediaobject>
250 <caption><para id="x_356">Using <command>kdiff3</command> to merge 251 <imageobject>
251 versions of a file</para></caption> 252 <imagedata fileref="kdiff3"/></imageobject>
253 <textobject>
254 <phrase>XXX add text</phrase>
255 </textobject>
252 </mediaobject> 256 </mediaobject>
253 </informalfigure> 257 </figure>
254 258
255 <para id="x_357">For each conflicting portion of the file, we can choose to 259 <para id="x_357">For each conflicting portion of the file, we can choose to
256 resolve the conflict using some combination of text from the 260 resolve the conflict using some combination of text from the
257 base version, ours, or theirs. We can also manually edit the 261 base version, ours, or theirs. We can also manually edit the
258 merged file at any time, in case we need to make further 262 merged file at any time, in case we need to make further