bos@96: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
bos@96: <!-- Created with Inkscape (http://www.inkscape.org/) -->
bos@96: <svg
bos@96:    xmlns:dc="http://purl.org/dc/elements/1.1/"
bos@96:    xmlns:cc="http://web.resource.org/cc/"
bos@96:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bos@96:    xmlns:svg="http://www.w3.org/2000/svg"
bos@96:    xmlns="http://www.w3.org/2000/svg"
bos@96:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
bos@96:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
bos@96:    width="744.09448819"
bos@96:    height="1052.3622047"
bos@96:    id="svg2"
bos@96:    sodipodi:version="0.32"
bos@96:    inkscape:version="0.44.1"
bos@100:    sodipodi:docname="tour-merge-merge.svg"
bos@99:    sodipodi:docbase="/home/bos/hg/hgbook/en">
bos@96:   <defs
bos@96:      id="defs4">
bos@96:     <marker
bos@97:        inkscape:stockid="Arrow1Mstart"
bos@97:        orient="auto"
bos@97:        refY="0.0"
bos@97:        refX="0.0"
bos@97:        id="Arrow1Mstart"
bos@97:        style="overflow:visible">
bos@97:       <path
bos@97:          id="path2973"
bos@97:          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:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
bos@97:          transform="scale(0.4) translate(10,0)" />
bos@97:     </marker>
bos@97:     <marker
bos@96:        inkscape:stockid="Arrow1Mend"
bos@96:        orient="auto"
bos@96:        refY="0.0"
bos@96:        refX="0.0"
bos@96:        id="Arrow1Mend"
bos@96:        style="overflow:visible;">
bos@96:       <path
bos@96:          id="path3066"
bos@96:          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:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
bos@96:          transform="scale(0.4) rotate(180) translate(10,0)" />
bos@96:     </marker>
bos@96:   </defs>
bos@96:   <sodipodi:namedview
bos@96:      id="base"
bos@96:      pagecolor="#ffffff"
bos@96:      bordercolor="#666666"
bos@96:      borderopacity="1.0"
bos@96:      gridtolerance="10000"
bos@96:      guidetolerance="10"
bos@96:      objecttolerance="10"
bos@96:      inkscape:pageopacity="0.0"
bos@96:      inkscape:pageshadow="2"
bos@96:      inkscape:zoom="1.4"
bos@100:      inkscape:cx="247.53795"
bos@100:      inkscape:cy="871.05738"
bos@96:      inkscape:document-units="px"
bos@96:      inkscape:current-layer="layer1"
bos@96:      inkscape:window-width="906"
bos@96:      inkscape:window-height="620"
bos@100:      inkscape:window-x="38"
bos@100:      inkscape:window-y="95" />
bos@96:   <metadata
bos@96:      id="metadata7">
bos@96:     <rdf:RDF>
bos@96:       <cc:Work
bos@96:          rdf:about="">
bos@96:         <dc:format>image/svg+xml</dc:format>
bos@96:         <dc:type
bos@96:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
bos@96:       </cc:Work>
bos@96:     </rdf:RDF>
bos@96:   </metadata>
bos@96:   <g
bos@96:      inkscape:label="Layer 1"
bos@96:      inkscape:groupmode="layer"
bos@96:      id="layer1">
bos@100:     <rect
bos@100:        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:        id="rect2995"
bos@100:        width="94.285713"
bos@100:        height="20.714285"
bos@100:        x="532.85718"
bos@100:        y="203.0479" />
bos@98:     <text
bos@98:        xml:space="preserve"
bos@98:        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:        x="173.57143"
bos@98:        y="443.79074"
bos@98:        id="text2832"><tspan
bos@98:          sodipodi:role="line"
bos@98:          id="tspan2834"
bos@98:          x="173.57143"
bos@98:          y="443.79074" /></text>
bos@98:     <rect
bos@98:        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:        id="rect2830"
bos@96:        width="94.285713"
bos@96:        height="20.714285"
bos@96:        x="138"
bos@100:        y="297.76227" />
bos@96:     <text
bos@96:        xml:space="preserve"
bos@96:        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:        x="162.09892"
bos@100:        y="311.38342"
bos@96:        id="text2824"><tspan
bos@96:          sodipodi:role="line"
bos@96:          id="tspan2826"
bos@96:          x="162.09892"
bos@100:          y="311.38342"
bos@96:          style="font-family:Courier"><tspan
bos@96:    style="font-weight:bold"
bos@96:    id="tspan2862">4</tspan>: b57f</tspan></text>
bos@98:     <path
bos@98:        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:        d="M 185.14286,343.63731 L 185.14286,319.47656"
bos@96:        id="path2900"
bos@96:        inkscape:connector-type="polyline" />
bos@98:     <rect
bos@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@99:        id="rect2863"
bos@99:        width="94.285713"
bos@99:        height="20.714285"
bos@99:        x="91.428574"
bos@100:        y="250.47656" />
bos@98:     <text
bos@98:        xml:space="preserve"
bos@98:        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:        x="116.09886"
bos@100:        y="264.56592"
bos@98:        id="text1965"
bos@98:        transform="scale(1.000002,0.999998)"><tspan
bos@98:          sodipodi:role="line"
bos@98:          id="tspan1967"
bos@99:          x="116.09886"
bos@100:          y="264.56592"
bos@98:          style="font-family:Courier"><tspan
bos@98:    style="font-weight:bold"
bos@98:    id="tspan1973">5</tspan>: ae13</tspan></text>
bos@98:     <path
bos@99:        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:        d="M 173.95727,296.76228 L 149.75702,272.19085"
bos@98:        id="path1971"
bos@99:        inkscape:connector-type="polyline"
bos@99:        inkscape:connection-end="#rect2863"
bos@99:        inkscape:connection-start="#rect2830" />
bos@98:     <rect
bos@98:        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:        id="rect2911"
bos@98:        width="94.285995"
bos@98:        height="20.714283"
bos@99:        x="186.71414"
bos@100:        y="204.40514" />
bos@98:     <text
bos@98:        xml:space="preserve"
bos@98:        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:        x="210.81311"
bos@100:        y="218.02673"
bos@98:        id="text2913"
bos@98:        transform="scale(1.000002,0.999998)"><tspan
bos@98:          sodipodi:role="line"
bos@98:          id="tspan2915"
bos@99:          x="210.81311"
bos@100:          y="218.02673"
bos@99:          style="font-family:Courier"><tspan
bos@99:    id="tspan1966"
bos@99:    style="font-weight:bold">6</tspan>: d2b5</tspan></text>
bos@99:     <path
bos@99:        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:        d="M 191.06908,296.76228 L 227.93092,226.11942"
bos@98:        id="path2919"
bos@99:        inkscape:connector-type="polyline"
bos@99:        inkscape:connection-start="#rect2830" />
bos@98:     <text
bos@98:        xml:space="preserve"
bos@98:        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:        x="295.28571"
bos@100:        y="217.56711"
bos@99:        id="text2871"><tspan
bos@99:          sodipodi:role="line"
bos@99:          id="tspan2873"
bos@99:          x="295.28571"
bos@100:          y="217.56711">tip (and head)</tspan></text>
bos@98:     <text
bos@98:        xml:space="preserve"
bos@98:        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:        x="76"
bos@100:        y="264.91769"
bos@99:        id="text2875"><tspan
bos@99:          sodipodi:role="line"
bos@99:          id="tspan2877"
bos@99:          x="76"
bos@100:          y="264.91769"
bos@99:          style="text-align:end;text-anchor:end">head</tspan></text>
bos@100:     <rect
bos@100:        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:        id="rect1913"
bos@100:        width="94.285713"
bos@100:        height="20.714285"
bos@100:        x="138"
bos@100:        y="156.90514" />
bos@100:     <path
bos@100:        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:        d="M 144.22399,249.47657 L 179.49029,178.61943"
bos@100:        id="path1915"
bos@100:        inkscape:connector-type="polyline"
bos@100:        inkscape:connection-start="#rect2863"
bos@100:        inkscape:connection-end="#rect1913" />
bos@100:     <path
bos@100:        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:        d="M 222.20966,203.40514 L 196.79033,178.61943"
bos@100:        id="path1917"
bos@100:        inkscape:connector-type="polyline"
bos@100:        inkscape:connection-start="#rect2911"
bos@100:        inkscape:connection-end="#rect1913" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="166.16823"
bos@100:        y="168.52228"
bos@100:        id="text2806"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2808"
bos@100:          x="166.16823"
bos@100:          y="168.52228"
bos@100:          style="font-family:Courier">merge</tspan></text>
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="246"
bos@100:        y="162.63338"
bos@100:        id="text2810"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2812"
bos@100:          x="246"
bos@100:          y="162.63338">working directory</tspan><tspan
bos@100:          sodipodi:role="line"
bos@100:          x="246"
bos@100:          y="177.63338"
bos@100:          id="tspan2814">during merge</tspan></text>
bos@100:     <rect
bos@100:        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:        id="rect2816"
bos@100:        width="94.285713"
bos@100:        height="20.714285"
bos@100:        x="483.14636"
bos@100:        y="297.76227" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="507.24527"
bos@100:        y="311.38342"
bos@100:        id="text2818"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2820"
bos@100:          x="507.24527"
bos@100:          y="311.38342"
bos@100:          style="font-family:Courier"><tspan
bos@100:    style="font-weight:bold"
bos@100:    id="tspan2822">4</tspan>: b57f</tspan></text>
bos@100:     <path
bos@100:        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:        d="M 530.28921,343.6373 L 530.28921,319.47655"
bos@100:        id="path2824"
bos@100:        inkscape:connector-type="polyline" />
bos@100:     <rect
bos@100:        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:        id="rect2826"
bos@100:        width="94.285713"
bos@100:        height="20.714285"
bos@100:        x="436.57492"
bos@100:        y="250.47656" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="461.24484"
bos@100:        y="264.56613"
bos@100:        id="text2828"
bos@100:        transform="scale(1.000002,0.999998)"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2830"
bos@100:          x="461.24484"
bos@100:          y="264.56613"
bos@100:          style="font-family:Courier"><tspan
bos@100:    style="font-weight:bold"
bos@100:    id="tspan2832">5</tspan>: ae13</tspan></text>
bos@100:     <path
bos@100:        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:        d="M 519.10362,296.76227 L 494.90337,272.19084"
bos@100:        id="path2834"
bos@100:        inkscape:connector-type="polyline" />
bos@100:     <rect
bos@100:        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:        id="rect2836"
bos@100:        width="94.285995"
bos@100:        height="20.714283"
bos@100:        x="483.14001"
bos@100:        y="156.548" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="555.95911"
bos@100:        y="218.02698"
bos@100:        id="text2838"
bos@100:        transform="scale(1.000002,0.999998)"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2840"
bos@100:          x="555.95911"
bos@100:          y="218.02698"
bos@100:          style="font-family:Courier"><tspan
bos@100:    id="tspan2842"
bos@100:    style="font-weight:bold">6</tspan>: d2b5</tspan></text>
bos@100:     <path
bos@100:        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:        d="M 536.21543,296.76227 L 574.03453,224.76218"
bos@100:        id="path2844"
bos@100:        inkscape:connector-type="polyline" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="594.43207"
bos@100:        y="169.78796"
bos@100:        id="text2846"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2848"
bos@100:          x="594.43207"
bos@100:          y="169.78796">tip</tspan></text>
bos@100:     <path
bos@100:        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:        d="M 489.37034,249.47656 L 524.65575,178.26229"
bos@100:        id="path2856"
bos@100:        inkscape:connector-type="polyline"
bos@100:        inkscape:connection-end="#rect2836" />
bos@100:     <path
bos@100:        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:        d="M 567.85714,202.0479 L 542.42591,178.26229"
bos@100:        id="path2858"
bos@100:        inkscape:connector-type="polyline"
bos@100:        inkscape:connection-end="#rect2836"
bos@100:        inkscape:connection-start="#rect2995" />
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="504.54507"
bos@100:        y="170.39714"
bos@100:        id="text2860"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2863"
bos@100:          x="504.54507"
bos@100:          y="170.39714"
bos@100:          style="font-family:Courier"><tspan
bos@100:    style="font-weight:bold"
bos@100:    id="tspan2997">7</tspan>: dba3</tspan></text>
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="90.323105"
bos@100:        y="120.21933"
bos@100:        id="text2929"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2931"
bos@100:          x="90.323105"
bos@100:          y="120.21933"
bos@100:          style="font-weight:bold">Working directory during merge</tspan></text>
bos@100:     <text
bos@100:        xml:space="preserve"
bos@100:        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:        x="435.35226"
bos@100:        y="120.21933"
bos@100:        id="text2937"><tspan
bos@100:          sodipodi:role="line"
bos@100:          id="tspan2939"
bos@100:          x="435.35226"
bos@100:          y="120.21933"
bos@100:          style="font-weight:bold">Repository after merge committed</tspan></text>
bos@96:   </g>
bos@96: </svg>