hgbook

annotate en/tour-merge-merge.svg @ 100:272146fab009

find changesets by author, revision, files, or words in the commit message
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
rev   line source
bos@96 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
bos@96 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
bos@96 3 <svg
bos@96 4 xmlns:dc="http://purl.org/dc/elements/1.1/"
bos@96 5 xmlns:cc="http://web.resource.org/cc/"
bos@96 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bos@96 7 xmlns:svg="http://www.w3.org/2000/svg"
bos@96 8 xmlns="http://www.w3.org/2000/svg"
bos@96 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
bos@96 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
bos@96 11 width="744.09448819"
bos@96 12 height="1052.3622047"
bos@96 13 id="svg2"
bos@96 14 sodipodi:version="0.32"
bos@96 15 inkscape:version="0.44.1"
bos@100 16 sodipodi:docname="tour-merge-merge.svg"
bos@99 17 sodipodi:docbase="/home/bos/hg/hgbook/en">
bos@96 18 <defs
bos@96 19 id="defs4">
bos@96 20 <marker
bos@97 21 inkscape:stockid="Arrow1Mstart"
bos@97 22 orient="auto"
bos@97 23 refY="0.0"
bos@97 24 refX="0.0"
bos@97 25 id="Arrow1Mstart"
bos@97 26 style="overflow:visible">
bos@97 27 <path
bos@97 28 id="path2973"
bos@97 29 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 "
bos@97 30 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
bos@97 31 transform="scale(0.4) translate(10,0)" />
bos@97 32 </marker>
bos@97 33 <marker
bos@96 34 inkscape:stockid="Arrow1Mend"
bos@96 35 orient="auto"
bos@96 36 refY="0.0"
bos@96 37 refX="0.0"
bos@96 38 id="Arrow1Mend"
bos@96 39 style="overflow:visible;">
bos@96 40 <path
bos@96 41 id="path3066"
bos@96 42 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 "
bos@96 43 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
bos@96 44 transform="scale(0.4) rotate(180) translate(10,0)" />
bos@96 45 </marker>
bos@96 46 </defs>
bos@96 47 <sodipodi:namedview
bos@96 48 id="base"
bos@96 49 pagecolor="#ffffff"
bos@96 50 bordercolor="#666666"
bos@96 51 borderopacity="1.0"
bos@96 52 gridtolerance="10000"
bos@96 53 guidetolerance="10"
bos@96 54 objecttolerance="10"
bos@96 55 inkscape:pageopacity="0.0"
bos@96 56 inkscape:pageshadow="2"
bos@96 57 inkscape:zoom="1.4"
bos@100 58 inkscape:cx="247.53795"
bos@100 59 inkscape:cy="871.05738"
bos@96 60 inkscape:document-units="px"
bos@96 61 inkscape:current-layer="layer1"
bos@96 62 inkscape:window-width="906"
bos@96 63 inkscape:window-height="620"
bos@100 64 inkscape:window-x="38"
bos@100 65 inkscape:window-y="95" />
bos@96 66 <metadata
bos@96 67 id="metadata7">
bos@96 68 <rdf:RDF>
bos@96 69 <cc:Work
bos@96 70 rdf:about="">
bos@96 71 <dc:format>image/svg+xml</dc:format>
bos@96 72 <dc:type
bos@96 73 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
bos@96 74 </cc:Work>
bos@96 75 </rdf:RDF>
bos@96 76 </metadata>
bos@96 77 <g
bos@96 78 inkscape:label="Layer 1"
bos@96 79 inkscape:groupmode="layer"
bos@96 80 id="layer1">
bos@100 81 <rect
bos@100 82 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"
bos@100 83 id="rect2995"
bos@100 84 width="94.285713"
bos@100 85 height="20.714285"
bos@100 86 x="532.85718"
bos@100 87 y="203.0479" />
bos@98 88 <text
bos@98 89 xml:space="preserve"
bos@98 90 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"
bos@98 91 x="173.57143"
bos@98 92 y="443.79074"
bos@98 93 id="text2832"><tspan
bos@98 94 sodipodi:role="line"
bos@98 95 id="tspan2834"
bos@98 96 x="173.57143"
bos@98 97 y="443.79074" /></text>
bos@98 98 <rect
bos@98 99 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"
bos@100 100 id="rect2830"
bos@96 101 width="94.285713"
bos@96 102 height="20.714285"
bos@96 103 x="138"
bos@100 104 y="297.76227" />
bos@96 105 <text
bos@96 106 xml:space="preserve"
bos@96 107 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"
bos@96 108 x="162.09892"
bos@100 109 y="311.38342"
bos@96 110 id="text2824"><tspan
bos@96 111 sodipodi:role="line"
bos@96 112 id="tspan2826"
bos@96 113 x="162.09892"
bos@100 114 y="311.38342"
bos@96 115 style="font-family:Courier"><tspan
bos@96 116 style="font-weight:bold"
bos@96 117 id="tspan2862">4</tspan>: b57f</tspan></text>
bos@98 118 <path
bos@98 119 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"
bos@100 120 d="M 185.14286,343.63731 L 185.14286,319.47656"
bos@96 121 id="path2900"
bos@96 122 inkscape:connector-type="polyline" />
bos@98 123 <rect
bos@99 124 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"
bos@99 125 id="rect2863"
bos@99 126 width="94.285713"
bos@99 127 height="20.714285"
bos@99 128 x="91.428574"
bos@100 129 y="250.47656" />
bos@98 130 <text
bos@98 131 xml:space="preserve"
bos@98 132 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"
bos@99 133 x="116.09886"
bos@100 134 y="264.56592"
bos@98 135 id="text1965"
bos@98 136 transform="scale(1.000002,0.999998)"><tspan
bos@98 137 sodipodi:role="line"
bos@98 138 id="tspan1967"
bos@99 139 x="116.09886"
bos@100 140 y="264.56592"
bos@98 141 style="font-family:Courier"><tspan
bos@98 142 style="font-weight:bold"
bos@98 143 id="tspan1973">5</tspan>: ae13</tspan></text>
bos@98 144 <path
bos@99 145 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"
bos@100 146 d="M 173.95727,296.76228 L 149.75702,272.19085"
bos@98 147 id="path1971"
bos@99 148 inkscape:connector-type="polyline"
bos@99 149 inkscape:connection-end="#rect2863"
bos@99 150 inkscape:connection-start="#rect2830" />
bos@98 151 <rect
bos@98 152 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"
bos@98 153 id="rect2911"
bos@98 154 width="94.285995"
bos@98 155 height="20.714283"
bos@99 156 x="186.71414"
bos@100 157 y="204.40514" />
bos@98 158 <text
bos@98 159 xml:space="preserve"
bos@98 160 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"
bos@99 161 x="210.81311"
bos@100 162 y="218.02673"
bos@98 163 id="text2913"
bos@98 164 transform="scale(1.000002,0.999998)"><tspan
bos@98 165 sodipodi:role="line"
bos@98 166 id="tspan2915"
bos@99 167 x="210.81311"
bos@100 168 y="218.02673"
bos@99 169 style="font-family:Courier"><tspan
bos@99 170 id="tspan1966"
bos@99 171 style="font-weight:bold">6</tspan>: d2b5</tspan></text>
bos@99 172 <path
bos@99 173 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"
bos@100 174 d="M 191.06908,296.76228 L 227.93092,226.11942"
bos@98 175 id="path2919"
bos@99 176 inkscape:connector-type="polyline"
bos@99 177 inkscape:connection-start="#rect2830" />
bos@98 178 <text
bos@98 179 xml:space="preserve"
bos@98 180 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"
bos@99 181 x="295.28571"
bos@100 182 y="217.56711"
bos@99 183 id="text2871"><tspan
bos@99 184 sodipodi:role="line"
bos@99 185 id="tspan2873"
bos@99 186 x="295.28571"
bos@100 187 y="217.56711">tip (and head)</tspan></text>
bos@98 188 <text
bos@98 189 xml:space="preserve"
bos@98 190 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"
bos@99 191 x="76"
bos@100 192 y="264.91769"
bos@99 193 id="text2875"><tspan
bos@99 194 sodipodi:role="line"
bos@99 195 id="tspan2877"
bos@99 196 x="76"
bos@100 197 y="264.91769"
bos@99 198 style="text-align:end;text-anchor:end">head</tspan></text>
bos@100 199 <rect
bos@100 200 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"
bos@100 201 id="rect1913"
bos@100 202 width="94.285713"
bos@100 203 height="20.714285"
bos@100 204 x="138"
bos@100 205 y="156.90514" />
bos@100 206 <path
bos@100 207 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"
bos@100 208 d="M 144.22399,249.47657 L 179.49029,178.61943"
bos@100 209 id="path1915"
bos@100 210 inkscape:connector-type="polyline"
bos@100 211 inkscape:connection-start="#rect2863"
bos@100 212 inkscape:connection-end="#rect1913" />
bos@100 213 <path
bos@100 214 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"
bos@100 215 d="M 222.20966,203.40514 L 196.79033,178.61943"
bos@100 216 id="path1917"
bos@100 217 inkscape:connector-type="polyline"
bos@100 218 inkscape:connection-start="#rect2911"
bos@100 219 inkscape:connection-end="#rect1913" />
bos@100 220 <text
bos@100 221 xml:space="preserve"
bos@100 222 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"
bos@100 223 x="166.16823"
bos@100 224 y="168.52228"
bos@100 225 id="text2806"><tspan
bos@100 226 sodipodi:role="line"
bos@100 227 id="tspan2808"
bos@100 228 x="166.16823"
bos@100 229 y="168.52228"
bos@100 230 style="font-family:Courier">merge</tspan></text>
bos@100 231 <text
bos@100 232 xml:space="preserve"
bos@100 233 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"
bos@100 234 x="246"
bos@100 235 y="162.63338"
bos@100 236 id="text2810"><tspan
bos@100 237 sodipodi:role="line"
bos@100 238 id="tspan2812"
bos@100 239 x="246"
bos@100 240 y="162.63338">working directory</tspan><tspan
bos@100 241 sodipodi:role="line"
bos@100 242 x="246"
bos@100 243 y="177.63338"
bos@100 244 id="tspan2814">during merge</tspan></text>
bos@100 245 <rect
bos@100 246 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"
bos@100 247 id="rect2816"
bos@100 248 width="94.285713"
bos@100 249 height="20.714285"
bos@100 250 x="483.14636"
bos@100 251 y="297.76227" />
bos@100 252 <text
bos@100 253 xml:space="preserve"
bos@100 254 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"
bos@100 255 x="507.24527"
bos@100 256 y="311.38342"
bos@100 257 id="text2818"><tspan
bos@100 258 sodipodi:role="line"
bos@100 259 id="tspan2820"
bos@100 260 x="507.24527"
bos@100 261 y="311.38342"
bos@100 262 style="font-family:Courier"><tspan
bos@100 263 style="font-weight:bold"
bos@100 264 id="tspan2822">4</tspan>: b57f</tspan></text>
bos@100 265 <path
bos@100 266 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"
bos@100 267 d="M 530.28921,343.6373 L 530.28921,319.47655"
bos@100 268 id="path2824"
bos@100 269 inkscape:connector-type="polyline" />
bos@100 270 <rect
bos@100 271 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"
bos@100 272 id="rect2826"
bos@100 273 width="94.285713"
bos@100 274 height="20.714285"
bos@100 275 x="436.57492"
bos@100 276 y="250.47656" />
bos@100 277 <text
bos@100 278 xml:space="preserve"
bos@100 279 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"
bos@100 280 x="461.24484"
bos@100 281 y="264.56613"
bos@100 282 id="text2828"
bos@100 283 transform="scale(1.000002,0.999998)"><tspan
bos@100 284 sodipodi:role="line"
bos@100 285 id="tspan2830"
bos@100 286 x="461.24484"
bos@100 287 y="264.56613"
bos@100 288 style="font-family:Courier"><tspan
bos@100 289 style="font-weight:bold"
bos@100 290 id="tspan2832">5</tspan>: ae13</tspan></text>
bos@100 291 <path
bos@100 292 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"
bos@100 293 d="M 519.10362,296.76227 L 494.90337,272.19084"
bos@100 294 id="path2834"
bos@100 295 inkscape:connector-type="polyline" />
bos@100 296 <rect
bos@100 297 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"
bos@100 298 id="rect2836"
bos@100 299 width="94.285995"
bos@100 300 height="20.714283"
bos@100 301 x="483.14001"
bos@100 302 y="156.548" />
bos@100 303 <text
bos@100 304 xml:space="preserve"
bos@100 305 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"
bos@100 306 x="555.95911"
bos@100 307 y="218.02698"
bos@100 308 id="text2838"
bos@100 309 transform="scale(1.000002,0.999998)"><tspan
bos@100 310 sodipodi:role="line"
bos@100 311 id="tspan2840"
bos@100 312 x="555.95911"
bos@100 313 y="218.02698"
bos@100 314 style="font-family:Courier"><tspan
bos@100 315 id="tspan2842"
bos@100 316 style="font-weight:bold">6</tspan>: d2b5</tspan></text>
bos@100 317 <path
bos@100 318 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"
bos@100 319 d="M 536.21543,296.76227 L 574.03453,224.76218"
bos@100 320 id="path2844"
bos@100 321 inkscape:connector-type="polyline" />
bos@100 322 <text
bos@100 323 xml:space="preserve"
bos@100 324 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"
bos@100 325 x="594.43207"
bos@100 326 y="169.78796"
bos@100 327 id="text2846"><tspan
bos@100 328 sodipodi:role="line"
bos@100 329 id="tspan2848"
bos@100 330 x="594.43207"
bos@100 331 y="169.78796">tip</tspan></text>
bos@100 332 <path
bos@100 333 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"
bos@100 334 d="M 489.37034,249.47656 L 524.65575,178.26229"
bos@100 335 id="path2856"
bos@100 336 inkscape:connector-type="polyline"
bos@100 337 inkscape:connection-end="#rect2836" />
bos@100 338 <path
bos@100 339 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"
bos@100 340 d="M 567.85714,202.0479 L 542.42591,178.26229"
bos@100 341 id="path2858"
bos@100 342 inkscape:connector-type="polyline"
bos@100 343 inkscape:connection-end="#rect2836"
bos@100 344 inkscape:connection-start="#rect2995" />
bos@100 345 <text
bos@100 346 xml:space="preserve"
bos@100 347 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"
bos@100 348 x="504.54507"
bos@100 349 y="170.39714"
bos@100 350 id="text2860"><tspan
bos@100 351 sodipodi:role="line"
bos@100 352 id="tspan2863"
bos@100 353 x="504.54507"
bos@100 354 y="170.39714"
bos@100 355 style="font-family:Courier"><tspan
bos@100 356 style="font-weight:bold"
bos@100 357 id="tspan2997">7</tspan>: dba3</tspan></text>
bos@100 358 <text
bos@100 359 xml:space="preserve"
bos@100 360 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"
bos@100 361 x="90.323105"
bos@100 362 y="120.21933"
bos@100 363 id="text2929"><tspan
bos@100 364 sodipodi:role="line"
bos@100 365 id="tspan2931"
bos@100 366 x="90.323105"
bos@100 367 y="120.21933"
bos@100 368 style="font-weight:bold">Working directory during merge</tspan></text>
bos@100 369 <text
bos@100 370 xml:space="preserve"
bos@100 371 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"
bos@100 372 x="435.35226"
bos@100 373 y="120.21933"
bos@100 374 id="text2937"><tspan
bos@100 375 sodipodi:role="line"
bos@100 376 id="tspan2939"
bos@100 377 x="435.35226"
bos@100 378 y="120.21933"
bos@100 379 style="font-weight:bold">Repository after merge committed</tspan></text>
bos@96 380 </g>
bos@96 381 </svg>