Mercurial > hgbook
view ja/figs/wdir.svg @ 836:d819bc2414f4
add figs/bad-merge-*.dot.
a part of 7226e5e750a6.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 23 Jul 2009 18:10:58 +0900 |
parents | ce4050cf7d44 |
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.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" /> </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="0.90509668" inkscape:cx="390.0539" 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"> <g id="g6431" transform="translate(0,-0.137863)"> <rect style="fill:url(#linearGradient6445);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" id="rect6047" width="174.36833" height="204.51619" x="94.198257" y="246.08011" /> <rect y="266.38159" x="114.11369" 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.1423" x="138.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.1423" x="138.7962" id="tspan6000" sodipodi:role="line">e7639888bb2f</tspan></text> <rect y="328.04825" x="114.11369" 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.80896" x="136.65421" 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.80896" x="136.65421" id="tspan6008" sodipodi:role="line">7b064d8bac5e</tspan></text> <path 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" d="M 181.38242,311.29315 L 181.38242,327.67412" id="path6020" inkscape:connector-type="polyline" inkscape:connection-end="#rect6004" /> <rect y="389.71487" x="114.11357" height="44.537449" width="134.53746" id="rect6039" 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" /> <text id="text6041" y="415.47556" x="138.79707" 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" xml:space="preserve"><tspan style="fill:#979797;fill-opacity:1;font-family:Courier" y="415.47556" x="138.79707" id="tspan6043" sodipodi:role="line">000000000000</tspan></text> <path 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" d="M 181.38238,372.95981 L 181.38235,389.34087" id="path6045" inkscape:connector-type="polyline" inkscape:connection-end="#rect6039" /> </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="93.660484" y="231.36218" id="text6102"><tspan sodipodi:role="line" id="tspan6104" x="93.660484" y="231.36218">History in repository</tspan></text> <g id="g6416"> <rect style="fill:url(#linearGradient6232);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" id="rect6140" width="174.36833" height="204.51619" x="323.28412" y="245.94225" /> <g transform="translate(28.32541,24.38544)" id="g6130"> <rect y="257.95059" x="314.87415" height="44.537449" width="134.53746" id="rect6106" 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="text6108" y="283.7113" x="339.55664" 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="283.7113" x="339.55664" id="tspan6110" sodipodi:role="line">e7639888bb2f</tspan></text> </g> <g transform="translate(29.03958,49.83106)" id="g6135"> <rect y="326.52203" x="314.15985" height="44.537449" width="134.53746" id="rect6112" 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" inkscape:transform-center-x="129.28571" inkscape:transform-center-y="102.85714" /> <text id="text6114" y="352.28271" x="338.84335" 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" xml:space="preserve" inkscape:transform-center-x="128.69672" inkscape:transform-center-y="102.7311"><tspan style="fill:#979797;fill-opacity:1;font-family:Courier" y="352.28271" x="338.84335" id="tspan6116" sodipodi:role="line">000000000000</tspan></text> </g> <text id="text6118" y="270.479" x="342.63208" 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 y="270.479" x="342.63208" id="tspan6120" sodipodi:role="line">First parent</tspan></text> <text id="text6122" y="364.49615" x="342.07544" 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 y="364.49615" x="342.07544" id="tspan6124" sodipodi:role="line">Second parent</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="322.61746" y="231.36218" id="text6195"><tspan sodipodi:role="line" id="tspan6197" x="322.61746" 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 342.82543,299.89384 L 249.02528,293.36123" id="path6266" inkscape:connector-type="polyline" inkscape:connection-start="#g6130" inkscape:connection-end="#rect5996" /> <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> </svg>