hgbook
diff en/tour-merge-merge.svg @ 100:272146fab009
Add yet another illustration of the merge process.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed Oct 18 12:06:56 2006 -0700 (2006-10-18) |
parents | en/tour-merge-pull.svg@06383f9e46e4 |
children | 321732566ac1 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/tour-merge-merge.svg Wed Oct 18 12:06:56 2006 -0700 1.3 @@ -0,0 +1,381 @@ 1.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 1.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 1.6 +<svg 1.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 1.8 + xmlns:cc="http://web.resource.org/cc/" 1.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 1.10 + xmlns:svg="http://www.w3.org/2000/svg" 1.11 + xmlns="http://www.w3.org/2000/svg" 1.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 1.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 1.14 + width="744.09448819" 1.15 + height="1052.3622047" 1.16 + id="svg2" 1.17 + sodipodi:version="0.32" 1.18 + inkscape:version="0.44.1" 1.19 + sodipodi:docname="tour-merge-merge.svg" 1.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 1.21 + <defs 1.22 + id="defs4"> 1.23 + <marker 1.24 + inkscape:stockid="Arrow1Mstart" 1.25 + orient="auto" 1.26 + refY="0.0" 1.27 + refX="0.0" 1.28 + id="Arrow1Mstart" 1.29 + style="overflow:visible"> 1.30 + <path 1.31 + id="path2973" 1.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 " 1.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 1.34 + transform="scale(0.4) translate(10,0)" /> 1.35 + </marker> 1.36 + <marker 1.37 + inkscape:stockid="Arrow1Mend" 1.38 + orient="auto" 1.39 + refY="0.0" 1.40 + refX="0.0" 1.41 + id="Arrow1Mend" 1.42 + style="overflow:visible;"> 1.43 + <path 1.44 + id="path3066" 1.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 " 1.46 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 1.47 + transform="scale(0.4) rotate(180) translate(10,0)" /> 1.48 + </marker> 1.49 + </defs> 1.50 + <sodipodi:namedview 1.51 + id="base" 1.52 + pagecolor="#ffffff" 1.53 + bordercolor="#666666" 1.54 + borderopacity="1.0" 1.55 + gridtolerance="10000" 1.56 + guidetolerance="10" 1.57 + objecttolerance="10" 1.58 + inkscape:pageopacity="0.0" 1.59 + inkscape:pageshadow="2" 1.60 + inkscape:zoom="1.4" 1.61 + inkscape:cx="247.53795" 1.62 + inkscape:cy="871.05738" 1.63 + inkscape:document-units="px" 1.64 + inkscape:current-layer="layer1" 1.65 + inkscape:window-width="906" 1.66 + inkscape:window-height="620" 1.67 + inkscape:window-x="38" 1.68 + inkscape:window-y="95" /> 1.69 + <metadata 1.70 + id="metadata7"> 1.71 + <rdf:RDF> 1.72 + <cc:Work 1.73 + rdf:about=""> 1.74 + <dc:format>image/svg+xml</dc:format> 1.75 + <dc:type 1.76 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 1.77 + </cc:Work> 1.78 + </rdf:RDF> 1.79 + </metadata> 1.80 + <g 1.81 + inkscape:label="Layer 1" 1.82 + inkscape:groupmode="layer" 1.83 + id="layer1"> 1.84 + <rect 1.85 + 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" 1.86 + id="rect2995" 1.87 + width="94.285713" 1.88 + height="20.714285" 1.89 + x="532.85718" 1.90 + y="203.0479" /> 1.91 + <text 1.92 + xml:space="preserve" 1.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:Courier" 1.94 + x="173.57143" 1.95 + y="443.79074" 1.96 + id="text2832"><tspan 1.97 + sodipodi:role="line" 1.98 + id="tspan2834" 1.99 + x="173.57143" 1.100 + y="443.79074" /></text> 1.101 + <rect 1.102 + 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" 1.103 + id="rect2830" 1.104 + width="94.285713" 1.105 + height="20.714285" 1.106 + x="138" 1.107 + y="297.76227" /> 1.108 + <text 1.109 + xml:space="preserve" 1.110 + 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" 1.111 + x="162.09892" 1.112 + y="311.38342" 1.113 + id="text2824"><tspan 1.114 + sodipodi:role="line" 1.115 + id="tspan2826" 1.116 + x="162.09892" 1.117 + y="311.38342" 1.118 + style="font-family:Courier"><tspan 1.119 + style="font-weight:bold" 1.120 + id="tspan2862">4</tspan>: b57f</tspan></text> 1.121 + <path 1.122 + 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" 1.123 + d="M 185.14286,343.63731 L 185.14286,319.47656" 1.124 + id="path2900" 1.125 + inkscape:connector-type="polyline" /> 1.126 + <rect 1.127 + 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" 1.128 + id="rect2863" 1.129 + width="94.285713" 1.130 + height="20.714285" 1.131 + x="91.428574" 1.132 + y="250.47656" /> 1.133 + <text 1.134 + xml:space="preserve" 1.135 + 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" 1.136 + x="116.09886" 1.137 + y="264.56592" 1.138 + id="text1965" 1.139 + transform="scale(1.000002,0.999998)"><tspan 1.140 + sodipodi:role="line" 1.141 + id="tspan1967" 1.142 + x="116.09886" 1.143 + y="264.56592" 1.144 + style="font-family:Courier"><tspan 1.145 + style="font-weight:bold" 1.146 + id="tspan1973">5</tspan>: ae13</tspan></text> 1.147 + <path 1.148 + 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" 1.149 + d="M 173.95727,296.76228 L 149.75702,272.19085" 1.150 + id="path1971" 1.151 + inkscape:connector-type="polyline" 1.152 + inkscape:connection-end="#rect2863" 1.153 + inkscape:connection-start="#rect2830" /> 1.154 + <rect 1.155 + 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" 1.156 + id="rect2911" 1.157 + width="94.285995" 1.158 + height="20.714283" 1.159 + x="186.71414" 1.160 + y="204.40514" /> 1.161 + <text 1.162 + xml:space="preserve" 1.163 + 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" 1.164 + x="210.81311" 1.165 + y="218.02673" 1.166 + id="text2913" 1.167 + transform="scale(1.000002,0.999998)"><tspan 1.168 + sodipodi:role="line" 1.169 + id="tspan2915" 1.170 + x="210.81311" 1.171 + y="218.02673" 1.172 + style="font-family:Courier"><tspan 1.173 + id="tspan1966" 1.174 + style="font-weight:bold">6</tspan>: d2b5</tspan></text> 1.175 + <path 1.176 + 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" 1.177 + d="M 191.06908,296.76228 L 227.93092,226.11942" 1.178 + id="path2919" 1.179 + inkscape:connector-type="polyline" 1.180 + inkscape:connection-start="#rect2830" /> 1.181 + <text 1.182 + xml:space="preserve" 1.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:Times New Roman" 1.184 + x="295.28571" 1.185 + y="217.56711" 1.186 + id="text2871"><tspan 1.187 + sodipodi:role="line" 1.188 + id="tspan2873" 1.189 + x="295.28571" 1.190 + y="217.56711">tip (and head)</tspan></text> 1.191 + <text 1.192 + xml:space="preserve" 1.193 + 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" 1.194 + x="76" 1.195 + y="264.91769" 1.196 + id="text2875"><tspan 1.197 + sodipodi:role="line" 1.198 + id="tspan2877" 1.199 + x="76" 1.200 + y="264.91769" 1.201 + style="text-align:end;text-anchor:end">head</tspan></text> 1.202 + <rect 1.203 + style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1" 1.204 + id="rect1913" 1.205 + width="94.285713" 1.206 + height="20.714285" 1.207 + x="138" 1.208 + y="156.90514" /> 1.209 + <path 1.210 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 1.211 + d="M 144.22399,249.47657 L 179.49029,178.61943" 1.212 + id="path1915" 1.213 + inkscape:connector-type="polyline" 1.214 + inkscape:connection-start="#rect2863" 1.215 + inkscape:connection-end="#rect1913" /> 1.216 + <path 1.217 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 1.218 + d="M 222.20966,203.40514 L 196.79033,178.61943" 1.219 + id="path1917" 1.220 + inkscape:connector-type="polyline" 1.221 + inkscape:connection-start="#rect2911" 1.222 + inkscape:connection-end="#rect1913" /> 1.223 + <text 1.224 + xml:space="preserve" 1.225 + 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" 1.226 + x="166.16823" 1.227 + y="168.52228" 1.228 + id="text2806"><tspan 1.229 + sodipodi:role="line" 1.230 + id="tspan2808" 1.231 + x="166.16823" 1.232 + y="168.52228" 1.233 + style="font-family:Courier">merge</tspan></text> 1.234 + <text 1.235 + xml:space="preserve" 1.236 + 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" 1.237 + x="246" 1.238 + y="162.63338" 1.239 + id="text2810"><tspan 1.240 + sodipodi:role="line" 1.241 + id="tspan2812" 1.242 + x="246" 1.243 + y="162.63338">working directory</tspan><tspan 1.244 + sodipodi:role="line" 1.245 + x="246" 1.246 + y="177.63338" 1.247 + id="tspan2814">during merge</tspan></text> 1.248 + <rect 1.249 + 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" 1.250 + id="rect2816" 1.251 + width="94.285713" 1.252 + height="20.714285" 1.253 + x="483.14636" 1.254 + y="297.76227" /> 1.255 + <text 1.256 + xml:space="preserve" 1.257 + 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" 1.258 + x="507.24527" 1.259 + y="311.38342" 1.260 + id="text2818"><tspan 1.261 + sodipodi:role="line" 1.262 + id="tspan2820" 1.263 + x="507.24527" 1.264 + y="311.38342" 1.265 + style="font-family:Courier"><tspan 1.266 + style="font-weight:bold" 1.267 + id="tspan2822">4</tspan>: b57f</tspan></text> 1.268 + <path 1.269 + 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" 1.270 + d="M 530.28921,343.6373 L 530.28921,319.47655" 1.271 + id="path2824" 1.272 + inkscape:connector-type="polyline" /> 1.273 + <rect 1.274 + 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" 1.275 + id="rect2826" 1.276 + width="94.285713" 1.277 + height="20.714285" 1.278 + x="436.57492" 1.279 + y="250.47656" /> 1.280 + <text 1.281 + xml:space="preserve" 1.282 + 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" 1.283 + x="461.24484" 1.284 + y="264.56613" 1.285 + id="text2828" 1.286 + transform="scale(1.000002,0.999998)"><tspan 1.287 + sodipodi:role="line" 1.288 + id="tspan2830" 1.289 + x="461.24484" 1.290 + y="264.56613" 1.291 + style="font-family:Courier"><tspan 1.292 + style="font-weight:bold" 1.293 + id="tspan2832">5</tspan>: ae13</tspan></text> 1.294 + <path 1.295 + 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" 1.296 + d="M 519.10362,296.76227 L 494.90337,272.19084" 1.297 + id="path2834" 1.298 + inkscape:connector-type="polyline" /> 1.299 + <rect 1.300 + 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" 1.301 + id="rect2836" 1.302 + width="94.285995" 1.303 + height="20.714283" 1.304 + x="483.14001" 1.305 + y="156.548" /> 1.306 + <text 1.307 + xml:space="preserve" 1.308 + 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" 1.309 + x="555.95911" 1.310 + y="218.02698" 1.311 + id="text2838" 1.312 + transform="scale(1.000002,0.999998)"><tspan 1.313 + sodipodi:role="line" 1.314 + id="tspan2840" 1.315 + x="555.95911" 1.316 + y="218.02698" 1.317 + style="font-family:Courier"><tspan 1.318 + id="tspan2842" 1.319 + style="font-weight:bold">6</tspan>: d2b5</tspan></text> 1.320 + <path 1.321 + 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" 1.322 + d="M 536.21543,296.76227 L 574.03453,224.76218" 1.323 + id="path2844" 1.324 + inkscape:connector-type="polyline" /> 1.325 + <text 1.326 + xml:space="preserve" 1.327 + 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" 1.328 + x="594.43207" 1.329 + y="169.78796" 1.330 + id="text2846"><tspan 1.331 + sodipodi:role="line" 1.332 + id="tspan2848" 1.333 + x="594.43207" 1.334 + y="169.78796">tip</tspan></text> 1.335 + <path 1.336 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" 1.337 + d="M 489.37034,249.47656 L 524.65575,178.26229" 1.338 + id="path2856" 1.339 + inkscape:connector-type="polyline" 1.340 + inkscape:connection-end="#rect2836" /> 1.341 + <path 1.342 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" 1.343 + d="M 567.85714,202.0479 L 542.42591,178.26229" 1.344 + id="path2858" 1.345 + inkscape:connector-type="polyline" 1.346 + inkscape:connection-end="#rect2836" 1.347 + inkscape:connection-start="#rect2995" /> 1.348 + <text 1.349 + xml:space="preserve" 1.350 + 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" 1.351 + x="504.54507" 1.352 + y="170.39714" 1.353 + id="text2860"><tspan 1.354 + sodipodi:role="line" 1.355 + id="tspan2863" 1.356 + x="504.54507" 1.357 + y="170.39714" 1.358 + style="font-family:Courier"><tspan 1.359 + style="font-weight:bold" 1.360 + id="tspan2997">7</tspan>: dba3</tspan></text> 1.361 + <text 1.362 + xml:space="preserve" 1.363 + 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" 1.364 + x="90.323105" 1.365 + y="120.21933" 1.366 + id="text2929"><tspan 1.367 + sodipodi:role="line" 1.368 + id="tspan2931" 1.369 + x="90.323105" 1.370 + y="120.21933" 1.371 + style="font-weight:bold">Working directory during merge</tspan></text> 1.372 + <text 1.373 + xml:space="preserve" 1.374 + 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" 1.375 + x="435.35226" 1.376 + y="120.21933" 1.377 + id="text2937"><tspan 1.378 + sodipodi:role="line" 1.379 + id="tspan2939" 1.380 + x="435.35226" 1.381 + y="120.21933" 1.382 + style="font-weight:bold">Repository after merge committed</tspan></text> 1.383 + </g> 1.384 +</svg>