bos@115: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
bos@115: <!-- Created with Inkscape (http://www.inkscape.org/) -->
bos@115: <svg
bos@115:    xmlns:dc="http://purl.org/dc/elements/1.1/"
bos@115:    xmlns:cc="http://web.resource.org/cc/"
bos@115:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bos@115:    xmlns:svg="http://www.w3.org/2000/svg"
bos@115:    xmlns="http://www.w3.org/2000/svg"
bos@115:    xmlns:xlink="http://www.w3.org/1999/xlink"
bos@115:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
bos@115:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
bos@115:    width="744.09448819"
bos@115:    height="1052.3622047"
bos@115:    id="svg5971"
bos@115:    sodipodi:version="0.32"
bos@115:    inkscape:version="0.44.1"
bos@115:    sodipodi:docbase="/home/bos/hg/hgbook/en"
bos@115:    sodipodi:docname="wdir-merge.svg">
bos@115:   <defs
bos@115:      id="defs5973">
bos@115:     <marker
bos@115:        inkscape:stockid="Arrow1Mstart"
bos@115:        orient="auto"
bos@115:        refY="0.0"
bos@115:        refX="0.0"
bos@115:        id="Arrow1Mstart"
bos@115:        style="overflow:visible">
bos@115:       <path
bos@115:          id="path4855"
bos@115:          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@115:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
bos@115:          transform="scale(0.4) translate(10,0)" />
bos@115:     </marker>
bos@115:     <linearGradient
bos@115:        id="linearGradient6049">
bos@115:       <stop
bos@115:          style="stop-color:#686868;stop-opacity:1;"
bos@115:          offset="0"
bos@115:          id="stop6051" />
bos@115:       <stop
bos@115:          style="stop-color:#f0f0f0;stop-opacity:1;"
bos@115:          offset="1"
bos@115:          id="stop6053" />
bos@115:     </linearGradient>
bos@115:     <marker
bos@115:        inkscape:stockid="Arrow1Mend"
bos@115:        orient="auto"
bos@115:        refY="0.0"
bos@115:        refX="0.0"
bos@115:        id="Arrow1Mend"
bos@115:        style="overflow:visible;">
bos@115:       <path
bos@115:          id="path4852"
bos@115:          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@115:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
bos@115:          transform="scale(0.4) rotate(180) translate(10,0)" />
bos@115:     </marker>
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6083"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="translate(-240.0462,-8.633237e-6)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6142"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="translate(-42.00893,-30.49544)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6193"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="translate(-240.0462,-8.633237e-6)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6216"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6232"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6445"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6974"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:     <linearGradient
bos@115:        inkscape:collect="always"
bos@115:        xlink:href="#linearGradient6049"
bos@115:        id="linearGradient6996"
bos@115:        gradientUnits="userSpaceOnUse"
bos@115:        gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)"
bos@115:        x1="333.91171"
bos@115:        y1="488.79077"
bos@115:        x2="508.94543"
bos@115:        y2="263.79077" />
bos@115:   </defs>
bos@115:   <sodipodi:namedview
bos@115:      id="base"
bos@115:      pagecolor="#ffffff"
bos@115:      bordercolor="#666666"
bos@115:      borderopacity="1.0"
bos@115:      gridtolerance="10000"
bos@115:      guidetolerance="10"
bos@115:      objecttolerance="10"
bos@115:      inkscape:pageopacity="0.0"
bos@115:      inkscape:pageshadow="2"
bos@115:      inkscape:zoom="1.28"
bos@115:      inkscape:cx="345.85973"
bos@115:      inkscape:cy="690.49342"
bos@115:      inkscape:document-units="px"
bos@115:      inkscape:current-layer="layer1"
bos@115:      showguides="true"
bos@115:      inkscape:guide-bbox="true"
bos@115:      inkscape:window-width="906"
bos@115:      inkscape:window-height="620"
bos@115:      inkscape:window-x="0"
bos@115:      inkscape:window-y="25">
bos@115:     <sodipodi:guide
bos@115:        orientation="vertical"
bos@115:        position="-1.4285714"
bos@115:        id="guide6022" />
bos@115:   </sodipodi:namedview>
bos@115:   <metadata
bos@115:      id="metadata5976">
bos@115:     <rdf:RDF>
bos@115:       <cc:Work
bos@115:          rdf:about="">
bos@115:         <dc:format>image/svg+xml</dc:format>
bos@115:         <dc:type
bos@115:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
bos@115:       </cc:Work>
bos@115:     </rdf:RDF>
bos@115:   </metadata>
bos@115:   <g
bos@115:      inkscape:label="Layer 1"
bos@115:      inkscape:groupmode="layer"
bos@115:      id="layer1">
bos@115:     <rect
bos@115:        y="246.06918"
bos@115:        x="64.325172"
bos@115:        height="204.26233"
bos@115:        width="333.2135"
bos@115:        id="rect6047"
bos@115:        style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
bos@115:     <g
bos@115:        id="g6976"
bos@115:        transform="translate(70,0)">
bos@115:       <rect
bos@115:          y="327.9104"
bos@115:          x="40.113693"
bos@115:          height="44.537449"
bos@115:          width="134.53746"
bos@115:          id="rect6004"
bos@115:          style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" />
bos@115:       <text
bos@115:          id="text6006"
bos@115:          y="353.67111"
bos@115:          x="62.654205"
bos@115:          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@115:          xml:space="preserve"><tspan
bos@115:            style="font-family:Courier"
bos@115:            y="353.67111"
bos@115:            x="62.654205"
bos@115:            id="tspan6008"
bos@115:            sodipodi:role="line">7b064d8bac5e</tspan></text>
bos@115:     </g>
bos@115:     <path
bos@115:        inkscape:connector-type="polyline"
bos@115:        id="path6020"
bos@115:        d="M 160.92915,311.15532 L 167.83571,327.53627"
bos@115:        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;display:inline"
bos@115:        inkscape:connection-end="#g6976"
bos@115:        inkscape:connection-start="#g1935" />
bos@115:     <rect
bos@115:        style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
bos@115:        id="rect6039"
bos@115:        width="134.53746"
bos@115:        height="44.537449"
bos@115:        x="110.11359"
bos@115:        y="389.57703" />
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
bos@115:        x="134.79706"
bos@115:        y="415.33771"
bos@115:        id="text6041"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan6043"
bos@115:          x="134.79706"
bos@115:          y="415.33771"
bos@115:          style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text>
bos@115:     <path
bos@115:        inkscape:connection-end="#rect6039"
bos@115:        inkscape:connector-type="polyline"
bos@115:        id="path6045"
bos@115:        d="M 177.38238,372.82195 L 177.38235,389.20303"
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" />
bos@115:     <rect
bos@115:        y="245.94225"
bos@115:        x="447.28412"
bos@115:        height="204.51619"
bos@115:        width="174.36833"
bos@115:        id="rect6140"
bos@115:        style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
bos@115:     <g
bos@115:        id="g6130"
bos@115:        transform="translate(152.3254,24.38544)">
bos@115:       <rect
bos@115:          style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1"
bos@115:          id="rect6106"
bos@115:          width="134.53746"
bos@115:          height="44.537449"
bos@115:          x="314.87415"
bos@115:          y="257.95059" />
bos@115:       <text
bos@115:          xml:space="preserve"
bos@115:          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@115:          x="339.55664"
bos@115:          y="283.7113"
bos@115:          id="text6108"><tspan
bos@115:            sodipodi:role="line"
bos@115:            id="tspan6110"
bos@115:            x="339.55664"
bos@115:            y="283.7113"
bos@115:            style="font-family:Courier">ffb20e1701ea</tspan></text>
bos@115:     </g>
bos@115:     <g
bos@115:        id="g6135"
bos@115:        transform="translate(153.0396,49.83106)">
bos@115:       <rect
bos@115:          inkscape:transform-center-y="102.85714"
bos@115:          inkscape:transform-center-x="129.28571"
bos@115:          style="fill:#d4d4d4;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
bos@115:          id="rect6112"
bos@115:          width="134.53746"
bos@115:          height="44.537449"
bos@115:          x="314.15985"
bos@115:          y="326.52203" />
bos@115:       <text
bos@115:          inkscape:transform-center-y="102.7311"
bos@115:          inkscape:transform-center-x="128.69672"
bos@115:          xml:space="preserve"
bos@115:          style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
bos@115:          x="338.84335"
bos@115:          y="352.28271"
bos@115:          id="text6114"><tspan
bos@115:            sodipodi:role="line"
bos@115:            id="tspan6116"
bos@115:            x="338.84335"
bos@115:            y="352.28271"
bos@115:            style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text>
bos@115:     </g>
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        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@115:        x="466.63208"
bos@115:        y="270.479"
bos@115:        id="text6118"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan6120"
bos@115:          x="466.63208"
bos@115:          y="270.479">First parent (unchanged)</tspan></text>
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        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@115:        x="466.07544"
bos@115:        y="364.49615"
bos@115:        id="text6122"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan6124"
bos@115:          x="466.07544"
bos@115:          y="364.49615">Second parent</tspan></text>
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        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@115:        x="446.61743"
bos@115:        y="231.36218"
bos@115:        id="text6195"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan6197"
bos@115:          x="446.61743"
bos@115:          y="231.36218">Parents of working directory</tspan></text>
bos@115:     <path
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
bos@115:        d="M 466.82542,300.21999 L 377.00207,294.39744"
bos@115:        id="path6266"
bos@115:        inkscape:connector-type="polyline"
bos@115:        inkscape:connection-start="#g6130"
bos@115:        inkscape:connection-end="#rect1925" />
bos@115:     <path
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@115:        d="M 665.12232,418.17579 L 665.12232,418.17579"
bos@115:        id="path6270"
bos@115:        inkscape:connector-type="polyline" />
bos@115:     <g
bos@115:        id="g2845">
bos@115:       <rect
bos@115:          y="266.24374"
bos@115:          x="242.09048"
bos@115:          height="44.537449"
bos@115:          width="134.53746"
bos@115:          id="rect1925"
bos@115:          style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" />
bos@115:       <text
bos@115:          id="text1927"
bos@115:          y="292.00446"
bos@115:          x="266.77298"
bos@115:          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@115:          xml:space="preserve"><tspan
bos@115:            style="font-family:Courier"
bos@115:            y="292.00446"
bos@115:            x="266.77298"
bos@115:            id="tspan1929"
bos@115:            sodipodi:role="line">ffb20e1701ea</tspan></text>
bos@115:     </g>
bos@115:     <path
bos@115:        inkscape:connector-type="polyline"
bos@115:        id="path1933"
bos@115:        d="M 260.89978,311.15532 L 225.84185,327.53627"
bos@115:        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;display:inline"
bos@115:        inkscape:connection-end="#g6976" />
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        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@115:        x="109.45568"
bos@115:        y="231.4554"
bos@115:        id="text2837"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan2839"
bos@115:          x="109.45568"
bos@115:          y="231.4554">Pre-existing head</tspan></text>
bos@115:     <text
bos@115:        xml:space="preserve"
bos@115:        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@115:        x="237.54184"
bos@115:        y="231.4554"
bos@115:        id="text2841"><tspan
bos@115:          sodipodi:role="line"
bos@115:          id="tspan2843"
bos@115:          x="237.54184"
bos@115:          y="231.4554">Newly created head (and tip)</tspan></text>
bos@115:     <path
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
bos@115:        d="M 148.05048,235.87482 L 149.94915,265.86962"
bos@115:        id="path2850"
bos@115:        inkscape:connector-type="polyline"
bos@115:        inkscape:connection-end="#g1935" />
bos@115:     <path
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
bos@115:        d="M 303.83495,238.08453 L 306.87874,265.86962"
bos@115:        id="path2852"
bos@115:        inkscape:connector-type="polyline"
bos@115:        inkscape:connection-end="#g2845" />
bos@115:     <path
bos@115:        style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
bos@115:        d="M 466.82545,379.17944 L 219.0253,307.95488"
bos@115:        id="path3016"
bos@115:        inkscape:connector-type="polyline"
bos@115:        inkscape:connection-start="#g6135"
bos@115:        inkscape:connection-end="#g1935" />
bos@115:     <g
bos@115:        id="g1935">
bos@115:       <rect
bos@115:          y="266.24374"
bos@115:          x="84.113708"
bos@115:          height="44.537449"
bos@115:          width="134.53746"
bos@115:          id="rect5996"
bos@115:          style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" />
bos@115:       <text
bos@115:          id="text5998"
bos@115:          y="292.00446"
bos@115:          x="108.7962"
bos@115:          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@115:          xml:space="preserve"><tspan
bos@115:            style="font-family:Courier"
bos@115:            y="292.00446"
bos@115:            x="108.7962"
bos@115:            id="tspan6000"
bos@115:            sodipodi:role="line">e7639888bb2f</tspan></text>
bos@115:     </g>
bos@115:   </g>
bos@115: </svg>