hgbook
diff en/ch03-tour-merge.xml @ 640:a13813534ccd
Fix all xref to figs
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Tue Mar 17 10:43:45 2009 +0800 (2009-03-17) |
parents | cfdb601a3c8b |
children | d0160b0b1a9e |
line diff
1.1 --- a/en/ch03-tour-merge.xml Thu Mar 12 15:51:39 2009 +0800 1.2 +++ b/en/ch03-tour-merge.xml Tue Mar 17 10:43:45 2009 +0800 1.3 @@ -37,7 +37,7 @@ 1.4 <para>We should now have two copies of 1.5 <filename>hello.c</filename> with different contents. The 1.6 histories of the two repositories have also diverged, as 1.7 - illustrated in figure <xref 1.8 + illustrated in figure <xref endterm="fig.tour-merge.sep-repos.caption" 1.9 linkend="fig.tour-merge.sep-repos"/>.</para> 1.10 1.11 &interaction.tour.merge.cat; 1.12 @@ -46,7 +46,8 @@ 1.13 <mediaobject> 1.14 <imageobject><imagedata fileref="images/tour-merge-sep-repos.png"/></imageobject> 1.15 <textobject><phrase>XXX add text</phrase></textobject> 1.16 - <caption><para>Divergent recent histories of the <filename 1.17 + <caption><para id="fig.tour-merge.sep-repos.caption">Divergent recent 1.18 + histories of the <filename 1.19 class="directory">my-hello</filename> and <filename 1.20 class="directory">my-new-hello</filename> 1.21 repositories</para></caption> 1.22 @@ -72,23 +73,24 @@ 1.23 head.</para> 1.24 1.25 <informalfigure id="fig.tour-merge.pull"> 1.26 - <mediaobject><imageobject><imagedata 1.27 - fileref="images/tour-merge-pull.png"/></imageobject><textobject><phrase>XXX 1.28 - add text</phrase></textobject> 1.29 - <caption><para>Repository contents after pulling from 1.30 - <filename class="directory">my-hello</filename> into 1.31 - <filename 1.32 - class="directory">my-new-hello</filename></para></caption> 1.33 + <mediaobject> 1.34 + <imageobject><imagedata fileref="images/tour-merge-pull.png"/></imageobject> 1.35 + <textobject><phrase>XXX add text</phrase></textobject> 1.36 + <caption><para id="fig.tour-merge.pull.caption">Repository contents after 1.37 + pulling from <filename class="directory">my-hello</filename> into 1.38 + <filename class="directory">my-new-hello</filename></para></caption> 1.39 </mediaobject> 1.40 </informalfigure> 1.41 1.42 - <para>In figure <xref linkend="fig.tour-merge.pull"/>, you can 1.43 + <para>In figure <xref endterm="fig.tour-merge.pull.caption" 1.44 + linkend="fig.tour-merge.pull"/>, you can 1.45 see the effect of the pull from <filename 1.46 class="directory">my-hello</filename> into <filename 1.47 class="directory">my-new-hello</filename>. The history that 1.48 was already present in <filename 1.49 class="directory">my-new-hello</filename> is untouched, but 1.50 a new revision has been added. By referring to figure <xref 1.51 + endterm="fig.tour-merge.sep-repos.caption" 1.52 linkend="fig.tour-merge.sep-repos"/>, we can see that the 1.53 <emphasis>changeset ID</emphasis> remains the same in the new 1.54 repository, but the <emphasis>revision number</emphasis> has 1.55 @@ -119,12 +121,11 @@ 1.56 &interaction.tour.merge.merge; 1.57 1.58 <informalfigure id="fig.tour-merge.merge"> 1.59 - 1.60 - <mediaobject><imageobject><imagedata 1.61 - fileref="images/tour-merge-merge.png"/></imageobject><textobject><phrase>XXX 1.62 - add text</phrase></textobject> 1.63 - <caption><para>Working directory and repository during 1.64 - merge, and following commit</para></caption> 1.65 + <mediaobject> 1.66 + <imageobject><imagedata fileref="images/tour-merge-merge.png"/></imageobject> 1.67 + <textobject><phrase>XXX add text</phrase></textobject> 1.68 + <caption><para id="fig.tour-merge.merge.caption">Working directory and 1.69 + repository during merge, and following commit</para></caption> 1.70 </mediaobject> 1.71 </informalfigure> 1.72 1.73 @@ -154,7 +155,7 @@ 1.74 1.75 &interaction.tour.merge.tip; 1.76 1.77 - <para>In figure <xref 1.78 + <para>In figure <xref endterm="fig.tour-merge.merge.caption" 1.79 linkend="fig.tour-merge.merge"/>, you can see a 1.80 representation of what happens to the working directory during 1.81 the merge, and how this affects the repository when the commit 1.82 @@ -174,16 +175,18 @@ 1.83 to decide how to reconcile the different changes into something 1.84 coherent.</para> 1.85 1.86 - <informalfigure> 1.87 - 1.88 - <mediaobject id="fig.tour-merge.conflict"> 1.89 - <imageobject><imagedata fileref="images/tour-merge-conflict.png"/></imageobject> 1.90 - <textobject><phrase>XXX add text</phrase></textobject> 1.91 - <caption><para>Conflicting changes to a 1.92 - document</para></caption> </mediaobject> 1.93 + <informalfigure id="fig.tour-merge.conflict"> 1.94 + <mediaobject> 1.95 + <imageobject><imagedata fileref="images/tour-merge-conflict.png"/> 1.96 + </imageobject> 1.97 + <textobject><phrase>XXX add text</phrase></textobject> 1.98 + <caption><para id="fig.tour-merge.conflict.caption">Conflicting 1.99 + changes to a document</para></caption> 1.100 + </mediaobject> 1.101 </informalfigure> 1.102 1.103 - <para>Figure <xref linkend="fig.tour-merge.conflict"/> illustrates 1.104 + <para>Figure <xref endterm="fig.tour-merge.conflict.caption" 1.105 + linkend="fig.tour-merge.conflict"/> illustrates 1.106 an instance of two conflicting changes to a document. We 1.107 started with a single version of the file; then we made some 1.108 changes; while someone else made different changes to the same 1.109 @@ -213,7 +216,8 @@ 1.110 <command>kdiff3</command>, which I'll use to describe the 1.111 features that are common to graphical file merging tools. You 1.112 can see a screenshot of <command>kdiff3</command> in action in 1.113 - figure <xref linkend="fig.tour-merge.kdiff3"/>. The kind of 1.114 + figure <xref endterm="fig.tour-merge.kdiff3.caption" 1.115 + linkend="fig.tour-merge.kdiff3"/>. The kind of 1.116 merge it is performing is called a <emphasis>three-way 1.117 merge</emphasis>, because there are three different versions 1.118 of the file of interest to us. The tool thus splits the upper 1.119 @@ -244,12 +248,14 @@ 1.120 corresponding sections of their respective files.</para> 1.121 1.122 <informalfigure id="fig.tour-merge.kdiff3"> 1.123 - <mediaobject><imageobject><imagedata width="100%" 1.124 - fileref="images/kdiff3.png"/></imageobject><textobject><phrase>XXX 1.125 - add text</phrase></textobject> 1.126 - <caption><para>Using <command>kdiff3</command> to merge 1.127 - versions of a file</para></caption> 1.128 - </mediaobject> 1.129 + <mediaobject> 1.130 + <imageobject><imagedata width="100%" fileref="images/kdiff3.png"/> 1.131 + </imageobject> 1.132 + <textobject><phrase>XXX add text</phrase></textobject> 1.133 + <caption><para id="fig.tour-merge.kdiff3.caption">Using 1.134 + <command>kdiff3</command> to merge versions of a file</para> 1.135 + </caption> 1.136 + </mediaobject> 1.137 </informalfigure> 1.138 1.139 <para>For each conflicting portion of the file, we can choose to 1.140 @@ -270,7 +276,8 @@ 1.141 <title>A worked example</title> 1.142 1.143 <para>In this example, we will reproduce the file modification 1.144 - history of figure <xref linkend="fig.tour-merge.conflict"/> 1.145 + history of figure <xref endterm="fig.tour-merge.conflict.caption" 1.146 + linkend="fig.tour-merge.conflict"/> 1.147 above. Let's begin by creating a repository with a base 1.148 version of our document.</para> 1.149