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