Mercurial > hgbook
view es/wdir-after-commit.svg @ 810:1a0a78e197c3
Incorporate feedback from Greg Lindahl.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 24 Apr 2009 00:27:05 -0700 |
parents | 04c08ad7e92e |
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://creativecommons.org/ns#" 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.46" sodipodi:docbase="/home/bos/hg/hgbook/en" sodipodi:docname="wdir-after-commit.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs5973"> <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective3128" /> <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" /> <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="translate(-6.0462,-0.664361)" 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.000474,0,0,0.790947,222.8399,50.85693)" x1="333.91171" y1="488.79077" x2="508.94543" y2="263.79077" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient6049" id="linearGradient6772" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.000474,0,0,0.790947,222.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="0.90509668" inkscape:cx="390.0539" inkscape:cy="602.10507" inkscape:document-units="px" inkscape:current-layer="layer1" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="906" inkscape:window-height="659" inkscape:window-x="11" inkscape:window-y="8" showgrid="false"> <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="245.98355" x="328.23956" height="258.57144" width="174.28572" id="rect6047" style="fill:url(#linearGradient6216);fill-opacity:1;stroke:#686868;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <g id="g6261" transform="translate(234,0)"> <rect y="258.7149" x="114.11369" height="44.537449" width="134.53746" id="rect5983" style="fill:#b1b1b1;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="text5985" y="284.47562" 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="284.47562" x="138.7962" id="tspan5987" sodipodi:role="line">dfbbb33f3fa3</tspan></text> </g> <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="rect5996" width="134.53746" height="44.537449" x="348.11371" y="320.38159" /> <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="372.7962" y="346.1423" id="text5998"><tspan sodipodi:role="line" id="tspan6000" x="372.7962" y="346.1423" style="font-family:Courier">e7639888bb2f</tspan></text> <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="rect6004" width="134.53746" height="44.537449" x="348.11371" y="382.04825" /> <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="370.65421" y="407.80896" id="text6006"><tspan sodipodi:role="line" id="tspan6008" x="370.65421" y="407.80896" style="font-family:Courier">7b064d8bac5e</tspan></text> <path inkscape:connector-type="polyline" id="path6018" d="M 415.38242,303.62646 L 415.38242,320.00744" 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" /> <path inkscape:connection-end="#rect6004" inkscape:connector-type="polyline" id="path6020" d="M 415.38242,365.29315 L 415.38243,381.67412" 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" /> <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="348.11359" y="443.71487" /> <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="372.79706" y="469.47556" id="text6041"><tspan sodipodi:role="line" id="tspan6043" x="372.79706" y="469.47556" 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 415.38238,426.95981 L 415.38235,443.34087" 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" /> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" x="327.66046" y="231.36218" id="text6102"><tspan sodipodi:role="line" id="tspan6104" x="327.66046" y="231.36218">Historia en el repositorio</tspan></text> <rect y="245.94225" x="557.28418" height="204.51619" width="174.36833" id="rect6140" 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" /> <g id="g6130" transform="translate(262.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">dfbbb33f3fa3</tspan></text> </g> <g id="g6135" transform="translate(263.0396,49.83106)"> <rect inkscape:transform-center-y="102.85714" inkscape:transform-center-x="129.28571" 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="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:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> </g> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" x="576.63208" y="270.479" id="text6118"><tspan sodipodi:role="line" id="tspan6120" x="576.63208" y="270.479">Primer padre</tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" x="576.07544" y="364.49615" id="text6122"><tspan sodipodi:role="line" id="tspan6124" x="576.07544" y="364.49615">Segundo padre</tspan></text> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" x="556.61743" y="231.36218" id="text6195"><tspan sodipodi:role="line" id="tspan6197" x="556.61743" y="231.36218">Padres del directorio de trabajo</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" d="M 576.82542,297.63008 L 483.02528,287.95831" id="path6266" inkscape:connector-type="polyline" inkscape:connection-start="#g6130" inkscape:connection-end="#g6261" /> <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" /> <text xml:space="preserve" style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" x="316.86407" y="275.6496" id="text6573"><tspan sodipodi:role="line" id="tspan6575" x="316.86407" y="275.6496" style="text-align:end;text-anchor:end">Nuevo</tspan><tspan sodipodi:role="line" x="316.86407" y="290.6496" id="tspan6577" style="text-align:end;text-anchor:end">conjunto</tspan><tspan sodipodi:role="line" x="316.86407" y="305.6496" style="text-align:end;text-anchor:end" id="tspan3470">de</tspan><tspan sodipodi:role="line" x="316.86407" y="320.6496" style="text-align:end;text-anchor:end" id="tspan3472">cambios</tspan></text> </g> </svg>