hgbook
changeset 99:06383f9e46e4
More graphics.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Oct 16 14:54:37 2006 -0700 (2006-10-16) |
parents | 3f3dd60695cb |
children | 272146fab009 |
files | en/Makefile en/tour-basic.tex en/tour-merge-pull.svg en/tour-merge-sep-repos.svg en/tour-merge.tex |
line diff
1.1 --- a/en/Makefile Mon Oct 16 11:38:06 2006 -0700 1.2 +++ b/en/Makefile Mon Oct 16 14:54:37 2006 -0700 1.3 @@ -20,7 +20,9 @@ 1.4 1.5 image-sources := \ 1.6 mq-stack.svg \ 1.7 - tour-history.svg 1.8 + tour-history.svg \ 1.9 + tour-merge-sep-repos.svg \ 1.10 + tour-merge-pull.svg 1.11 1.12 example-sources := \ 1.13 daily.files \
2.1 --- a/en/tour-basic.tex Mon Oct 16 11:38:06 2006 -0700 2.2 +++ b/en/tour-basic.tex Mon Oct 16 14:54:37 2006 -0700 2.3 @@ -182,7 +182,7 @@ 2.4 The default output printed by \hgcmd{log} is purely a summary; it is 2.5 missing a lot of detail. 2.6 2.7 -Figure~\ref{fig:tour:history} provides a graphical representation of 2.8 +Figure~\ref{fig:tour-basic:history} provides a graphical representation of 2.9 the history of the \dirname{hello} repository, to make it a little 2.10 easier to see which direction history is ``flowing'' in. We'll be 2.11 returning to this figure several times in this chapter and the chapter 2.12 @@ -192,19 +192,19 @@ 2.13 \centering 2.14 \grafix{tour-history} 2.15 \caption{Graphical history of the \dirname{hello} repository} 2.16 - \label{fig:tour:history} 2.17 + \label{fig:tour-basic:history} 2.18 \end{figure} 2.19 2.20 \subsection{Changesets, revisions, and talking to other 2.21 people} 2.22 2.23 As English is a notoriously sloppy language, and computer science has 2.24 -a history of terminological confusion, revision control has a variety 2.25 -of terms that have the same meaning. If you are talking about 2.26 -Mercurial history with other people, you will find that the word 2.27 -``changeset'' is often compressed to ``change'' or (when written) 2.28 -``cset'', and sometimes a changeset is referred to as a ``revision'' 2.29 -or a ``rev''. 2.30 +a hallowed history of terminological confusion (why use one term when 2.31 +four will do?), revision control has a variety of words and phrases 2.32 +that mean the same thing. If you are talking about Mercurial history 2.33 +with other people, you will find that the word ``changeset'' is often 2.34 +compressed to ``change'' or (when written) ``cset'', and sometimes a 2.35 +changeset is referred to as a ``revision'' or a ``rev''. 2.36 2.37 While it doesn't matter what \emph{word} you use to refer to the 2.38 concept of ``a~changeset'', the \emph{identifier} that you use to
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/en/tour-merge-pull.svg Mon Oct 16 14:54:37 2006 -0700 3.3 @@ -0,0 +1,288 @@ 3.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 3.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 3.6 +<svg 3.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 3.8 + xmlns:cc="http://web.resource.org/cc/" 3.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 3.10 + xmlns:svg="http://www.w3.org/2000/svg" 3.11 + xmlns="http://www.w3.org/2000/svg" 3.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 3.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 3.14 + width="744.09448819" 3.15 + height="1052.3622047" 3.16 + id="svg2" 3.17 + sodipodi:version="0.32" 3.18 + inkscape:version="0.44.1" 3.19 + sodipodi:docname="tour-merge-pull.svg" 3.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 3.21 + <defs 3.22 + id="defs4"> 3.23 + <marker 3.24 + inkscape:stockid="Arrow1Mstart" 3.25 + orient="auto" 3.26 + refY="0.0" 3.27 + refX="0.0" 3.28 + id="Arrow1Mstart" 3.29 + style="overflow:visible"> 3.30 + <path 3.31 + id="path2973" 3.32 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 3.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 3.34 + transform="scale(0.4) translate(10,0)" /> 3.35 + </marker> 3.36 + <marker 3.37 + inkscape:stockid="Arrow1Mend" 3.38 + orient="auto" 3.39 + refY="0.0" 3.40 + refX="0.0" 3.41 + id="Arrow1Mend" 3.42 + style="overflow:visible;"> 3.43 + <path 3.44 + id="path3066" 3.45 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 3.46 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 3.47 + transform="scale(0.4) rotate(180) translate(10,0)" /> 3.48 + </marker> 3.49 + </defs> 3.50 + <sodipodi:namedview 3.51 + id="base" 3.52 + pagecolor="#ffffff" 3.53 + bordercolor="#666666" 3.54 + borderopacity="1.0" 3.55 + gridtolerance="10000" 3.56 + guidetolerance="10" 3.57 + objecttolerance="10" 3.58 + inkscape:pageopacity="0.0" 3.59 + inkscape:pageshadow="2" 3.60 + inkscape:zoom="1.4" 3.61 + inkscape:cx="233.63208" 3.62 + inkscape:cy="832.54381" 3.63 + inkscape:document-units="px" 3.64 + inkscape:current-layer="layer1" 3.65 + inkscape:window-width="906" 3.66 + inkscape:window-height="620" 3.67 + inkscape:window-x="237" 3.68 + inkscape:window-y="103" /> 3.69 + <metadata 3.70 + id="metadata7"> 3.71 + <rdf:RDF> 3.72 + <cc:Work 3.73 + rdf:about=""> 3.74 + <dc:format>image/svg+xml</dc:format> 3.75 + <dc:type 3.76 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 3.77 + </cc:Work> 3.78 + </rdf:RDF> 3.79 + </metadata> 3.80 + <g 3.81 + inkscape:label="Layer 1" 3.82 + inkscape:groupmode="layer" 3.83 + id="layer1"> 3.84 + <text 3.85 + xml:space="preserve" 3.86 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.87 + x="173.57143" 3.88 + y="443.79074" 3.89 + id="text2832"><tspan 3.90 + sodipodi:role="line" 3.91 + id="tspan2834" 3.92 + x="173.57143" 3.93 + y="443.79074" /></text> 3.94 + <rect 3.95 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.96 + id="rect1878" 3.97 + width="94.285713" 3.98 + height="20.714285" 3.99 + x="138" 3.100 + y="479.50504" /> 3.101 + <text 3.102 + xml:space="preserve" 3.103 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.104 + x="162.09892" 3.105 + y="493.12619" 3.106 + id="text1872"><tspan 3.107 + sodipodi:role="line" 3.108 + id="tspan1874" 3.109 + x="162.09892" 3.110 + y="493.12619" 3.111 + style="font-family:Courier"><tspan 3.112 + style="font-weight:bold" 3.113 + id="tspan1876">0</tspan>: 0a04</tspan></text> 3.114 + <rect 3.115 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.116 + id="rect2800" 3.117 + width="94.285713" 3.118 + height="20.714285" 3.119 + x="138" 3.120 + y="432.63004" /> 3.121 + <text 3.122 + xml:space="preserve" 3.123 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.124 + x="162.09892" 3.125 + y="446.25119" 3.126 + id="text2794"><tspan 3.127 + sodipodi:role="line" 3.128 + id="tspan2796" 3.129 + x="162.09892" 3.130 + y="446.25119" 3.131 + style="font-family:Courier"><tspan 3.132 + id="tspan2868" 3.133 + style="font-weight:bold">1</tspan>: 82e5</tspan></text> 3.134 + <rect 3.135 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.136 + id="rect2810" 3.137 + width="94.285713" 3.138 + height="20.714285" 3.139 + x="138" 3.140 + y="385.75504" /> 3.141 + <text 3.142 + xml:space="preserve" 3.143 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.144 + x="162.09892" 3.145 + y="399.37619" 3.146 + id="text2804"><tspan 3.147 + sodipodi:role="line" 3.148 + id="tspan2806" 3.149 + x="162.09892" 3.150 + y="399.37619" 3.151 + style="font-family:Courier"><tspan 3.152 + style="font-weight:bold" 3.153 + id="tspan2866">2</tspan>: 057d</tspan></text> 3.154 + <rect 3.155 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.156 + id="rect2820" 3.157 + width="94.285713" 3.158 + height="20.714285" 3.159 + x="138" 3.160 + y="338.88007" /> 3.161 + <text 3.162 + xml:space="preserve" 3.163 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.164 + x="162.09892" 3.165 + y="352.50122" 3.166 + id="text2814"><tspan 3.167 + sodipodi:role="line" 3.168 + id="tspan2816" 3.169 + x="162.09892" 3.170 + y="352.50122" 3.171 + style="font-family:Courier"><tspan 3.172 + style="font-weight:bold" 3.173 + id="tspan2864">3</tspan>: ff5d</tspan></text> 3.174 + <rect 3.175 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.176 + id="rect2830" 3.177 + width="94.285713" 3.178 + height="20.714285" 3.179 + x="138" 3.180 + y="292.00504" /> 3.181 + <text 3.182 + xml:space="preserve" 3.183 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.184 + x="162.09892" 3.185 + y="305.62619" 3.186 + id="text2824"><tspan 3.187 + sodipodi:role="line" 3.188 + id="tspan2826" 3.189 + x="162.09892" 3.190 + y="305.62619" 3.191 + style="font-family:Courier"><tspan 3.192 + style="font-weight:bold" 3.193 + id="tspan2862">4</tspan>: b57f</tspan></text> 3.194 + <path 3.195 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.196 + d="M 185.14286,478.50504 L 185.14286,454.34432" 3.197 + id="path2894" 3.198 + inkscape:connector-type="polyline" /> 3.199 + <path 3.200 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.201 + d="M 185.14286,431.63004 L 185.14286,407.46932" 3.202 + id="path2896" 3.203 + inkscape:connector-type="polyline" /> 3.204 + <path 3.205 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.206 + d="M 185.14286,384.75504 L 185.14286,360.59435" 3.207 + id="path2898" 3.208 + inkscape:connector-type="polyline" /> 3.209 + <path 3.210 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.211 + d="M 185.14286,337.88007 L 185.14286,313.71932" 3.212 + id="path2900" 3.213 + inkscape:connector-type="polyline" /> 3.214 + <rect 3.215 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.216 + id="rect2863" 3.217 + width="94.285713" 3.218 + height="20.714285" 3.219 + x="91.428574" 3.220 + y="244.71933" /> 3.221 + <text 3.222 + xml:space="preserve" 3.223 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.224 + x="116.09886" 3.225 + y="258.80865" 3.226 + id="text1965" 3.227 + transform="scale(1.000002,0.999998)"><tspan 3.228 + sodipodi:role="line" 3.229 + id="tspan1967" 3.230 + x="116.09886" 3.231 + y="258.80865" 3.232 + style="font-family:Courier"><tspan 3.233 + style="font-weight:bold" 3.234 + id="tspan1973">5</tspan>: ae13</tspan></text> 3.235 + <path 3.236 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 3.237 + d="M 173.95727,291.00504 L 149.75702,266.43361" 3.238 + id="path1971" 3.239 + inkscape:connector-type="polyline" 3.240 + inkscape:connection-end="#rect2863" 3.241 + inkscape:connection-start="#rect2830" /> 3.242 + <rect 3.243 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 3.244 + id="rect2911" 3.245 + width="94.285995" 3.246 + height="20.714283" 3.247 + x="186.71414" 3.248 + y="198.6479" /> 3.249 + <text 3.250 + xml:space="preserve" 3.251 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 3.252 + x="210.81311" 3.253 + y="212.26949" 3.254 + id="text2913" 3.255 + transform="scale(1.000002,0.999998)"><tspan 3.256 + sodipodi:role="line" 3.257 + id="tspan2915" 3.258 + x="210.81311" 3.259 + y="212.26949" 3.260 + style="font-family:Courier"><tspan 3.261 + id="tspan1966" 3.262 + style="font-weight:bold">6</tspan>: d2b5</tspan></text> 3.263 + <path 3.264 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 3.265 + d="M 191.06908,291.00504 L 227.93092,220.36218" 3.266 + id="path2919" 3.267 + inkscape:connector-type="polyline" 3.268 + inkscape:connection-start="#rect2830" /> 3.269 + <text 3.270 + xml:space="preserve" 3.271 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.272 + x="295.28571" 3.273 + y="211.80988" 3.274 + id="text2871"><tspan 3.275 + sodipodi:role="line" 3.276 + id="tspan2873" 3.277 + x="295.28571" 3.278 + y="211.80988">tip (and head)</tspan></text> 3.279 + <text 3.280 + xml:space="preserve" 3.281 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 3.282 + x="76" 3.283 + y="259.16046" 3.284 + id="text2875"><tspan 3.285 + sodipodi:role="line" 3.286 + id="tspan2877" 3.287 + x="76" 3.288 + y="259.16046" 3.289 + style="text-align:end;text-anchor:end">head</tspan></text> 3.290 + </g> 3.291 +</svg>
4.1 --- a/en/tour-merge-sep-repos.svg Mon Oct 16 11:38:06 2006 -0700 4.2 +++ b/en/tour-merge-sep-repos.svg Mon Oct 16 14:54:37 2006 -0700 4.3 @@ -13,7 +13,7 @@ 4.4 id="svg2" 4.5 sodipodi:version="0.32" 4.6 inkscape:version="0.44.1" 4.7 - sodipodi:docname="tour-merge-repos.svg"> 4.8 + sodipodi:docname="tour-merge-sep-repos.svg"> 4.9 <defs 4.10 id="defs4"> 4.11 <marker 4.12 @@ -55,7 +55,7 @@ 4.13 inkscape:pageshadow="2" 4.14 inkscape:zoom="1.4" 4.15 inkscape:cx="307.20351" 4.16 - inkscape:cy="747.80768" 4.17 + inkscape:cy="716.87911" 4.18 inkscape:document-units="px" 4.19 inkscape:current-layer="layer1" 4.20 inkscape:window-width="906" 4.21 @@ -415,43 +415,52 @@ 4.22 y="267.12723" 4.23 style="text-align:center;text-anchor:middle" 4.24 id="tspan3132">differ</tspan></text> 4.25 + <text 4.26 + xml:space="preserve" 4.27 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.28 + x="262.15436" 4.29 + y="398.37112" 4.30 + id="text2929"><tspan 4.31 + sodipodi:role="line" 4.32 + x="262.15436" 4.33 + y="398.37112" 4.34 + id="tspan3013" 4.35 + style="text-align:start;text-anchor:start">common history</tspan></text> 4.36 <g 4.37 - id="g3122" 4.38 + id="g3107" 4.39 transform="translate(0,0.855744)"> 4.40 - <text 4.41 - id="text2929" 4.42 - y="397.51538" 4.43 - x="262.15436" 4.44 - style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.45 - xml:space="preserve"><tspan 4.46 - style="text-align:start;text-anchor:start" 4.47 - id="tspan3013" 4.48 - y="397.51538" 4.49 - x="262.15436" 4.50 - sodipodi:role="line">common history</tspan></text> 4.51 - <g 4.52 - id="g3107"> 4.53 - <path 4.54 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 4.55 - d="M 300.35713,381.29075 L 300.35713,304.50504" 4.56 - id="path3101" /> 4.57 - <path 4.58 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 4.59 - d="M 291.07142,301.64789 L 309.28571,301.64789" 4.60 - id="path3105" /> 4.61 - </g> 4.62 - <g 4.63 - transform="matrix(1,0,0,-1,0.178583,789.2886)" 4.64 - id="g3111"> 4.65 - <path 4.66 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 4.67 - d="M 300.35713,381.29075 L 300.35713,304.50504" 4.68 - id="path3113" /> 4.69 - <path 4.70 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 4.71 - d="M 291.07142,301.64789 L 309.28571,301.64789" 4.72 - id="path3115" /> 4.73 - </g> 4.74 + <path 4.75 + id="path3101" 4.76 + d="M 300.35713,381.29075 L 300.35713,304.50504" 4.77 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" /> 4.78 + <path 4.79 + id="path3105" 4.80 + d="M 291.07142,301.64789 L 309.28571,301.64789" 4.81 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 4.82 </g> 4.83 + <path 4.84 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 4.85 + d="M 300.53571,486.38926 L 300.53571,409.60355" 4.86 + id="path3113" /> 4.87 + <path 4.88 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 4.89 + d="M 291.25,488.49641 L 309.46429,488.49641" 4.90 + id="path3115" /> 4.91 + <text 4.92 + xml:space="preserve" 4.93 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 4.94 + x="480.71429" 4.95 + y="250.91507" 4.96 + id="text1949"><tspan 4.97 + sodipodi:role="line" 4.98 + id="tspan1951" 4.99 + x="480.71429" 4.100 + y="250.91507" 4.101 + style="text-align:start;text-anchor:start">head revision</tspan><tspan 4.102 + sodipodi:role="line" 4.103 + x="480.71429" 4.104 + y="265.91507" 4.105 + id="tspan1953" 4.106 + style="text-align:start;text-anchor:start">(has no children)</tspan></text> 4.107 </g> 4.108 </svg>
5.1 --- a/en/tour-merge.tex Mon Oct 16 11:38:06 2006 -0700 5.2 +++ b/en/tour-merge.tex Mon Oct 16 14:54:37 2006 -0700 5.3 @@ -27,17 +27,46 @@ 5.4 in it. 5.5 \interaction{tour.merge.clone} 5.6 We should now have two copies of \filename{hello.c} with different 5.7 -contents. 5.8 +contents. The histories of the two repositories have also diverged, 5.9 +as illustrated in figure~\ref{fig:tour-merge:sep-repos}. 5.10 \interaction{tour.merge.cat} 5.11 5.12 +\begin{figure}[ht] 5.13 + \centering 5.14 + \grafix{tour-merge-sep-repos} 5.15 + \caption{Divergent recent histories of the \dirname{my-hello} and 5.16 + \dirname{my-new-hello} repositories} 5.17 + \label{fig:tour-merge:sep-repos} 5.18 +\end{figure} 5.19 + 5.20 We already know that pulling changes from our \dirname{my-hello} 5.21 repository will have no effect on the working directory. 5.22 \interaction{tour.merge.pull} 5.23 However, the \hgcmd{pull} command says something about ``heads''. 5.24 5.25 -A head is a change that has no descendants. The tip revision is thus 5.26 -a head, but a repository can contain more than one head. We can view 5.27 -them using the \hgcmd{heads} command. 5.28 +A head is a change that has no descendants, or children, as they're 5.29 +also known. The tip revision is thus a head, because the newest 5.30 +revision in a repository doesn't have any children, but a repository 5.31 +can contain more than one head. 5.32 + 5.33 +\begin{figure}[ht] 5.34 + \centering 5.35 + \grafix{tour-merge-pull} 5.36 + \caption{Repository contents after pulling from \dirname{my-hello} into 5.37 + \dirname{my-new-hello}} 5.38 + \label{fig:tour-merge:pull} 5.39 +\end{figure} 5.40 + 5.41 +In figure~\ref{fig:tour-merge:pull}, you can see the effect of the 5.42 +pull from \dirname{my-hello} into \dirname{my-new-hello}. The history 5.43 +that was already present in \dirname{my-new-hello} is untouched, but a 5.44 +new revision has been added. By referring to 5.45 +figure~\ref{fig:tour-merge:sep-repos}, we can see that the 5.46 +\emph{changeset ID} remains the same in the new repository, but the 5.47 +\emph{revision number} has changed. (This, incidentally, is a fine 5.48 +example of why it's not safe to use revision numbers when discussing 5.49 +changesets.) We can view the heads in a repository using the 5.50 +\hgcmd{heads} command. 5.51 \interaction{tour.merge.heads} 5.52 What happens if we try to use the normal \hgcmd{update} command to 5.53 update to the new tip?