Mercurial > hgbook

view en/tour-merge-pull.svg @ 201:80fc720338a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mention use of hooks to defend against propagation of bad changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 18 Apr 2007 15:48:00 -0700
parents 06383f9e46e4
children fb5c0d56d7f1
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="744.09448819"
   height="1052.3622047"
   id="svg2"
   sodipodi:version="0.32"
   inkscape:version="0.44.1"
   sodipodi:docname="tour-merge-pull.svg"
   sodipodi:docbase="/home/bos/hg/hgbook/en">
  <defs
     id="defs4">
    <marker
       inkscape:stockid="Arrow1Mstart"
       orient="auto"
       refY="0.0"
       refX="0.0"
       id="Arrow1Mstart"
       style="overflow:visible">
      <path
         id="path2973"
         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>
    <marker
       inkscape:stockid="Arrow1Mend"
       orient="auto"
       refY="0.0"
       refX="0.0"
       id="Arrow1Mend"
       style="overflow:visible;">
      <path
         id="path3066"
         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>
  </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.4"
     inkscape:cx="233.63208"
     inkscape:cy="832.54381"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     inkscape:window-width="906"
     inkscape:window-height="620"
     inkscape:window-x="237"
     inkscape:window-y="103" />
  <metadata
     id="metadata7">
    <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">
    <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:Courier"
       x="173.57143"
       y="443.79074"
       id="text2832"><tspan
         sodipodi:role="line"
         id="tspan2834"
         x="173.57143"
         y="443.79074" /></text>
    <rect
       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"
       id="rect1878"
       width="94.285713"
       height="20.714285"
       x="138"
       y="479.50504" />
    <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:Courier"
       x="162.09892"
       y="493.12619"
       id="text1872"><tspan
         sodipodi:role="line"
         id="tspan1874"
         x="162.09892"
         y="493.12619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan1876">0</tspan>: 0a04</tspan></text>
    <rect
       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"
       id="rect2800"
       width="94.285713"
       height="20.714285"
       x="138"
       y="432.63004" />
    <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:Courier"
       x="162.09892"
       y="446.25119"
       id="text2794"><tspan
         sodipodi:role="line"
         id="tspan2796"
         x="162.09892"
         y="446.25119"
         style="font-family:Courier"><tspan
   id="tspan2868"
   style="font-weight:bold">1</tspan>: 82e5</tspan></text>
    <rect
       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"
       id="rect2810"
       width="94.285713"
       height="20.714285"
       x="138"
       y="385.75504" />
    <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:Courier"
       x="162.09892"
       y="399.37619"
       id="text2804"><tspan
         sodipodi:role="line"
         id="tspan2806"
         x="162.09892"
         y="399.37619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2866">2</tspan>: 057d</tspan></text>
    <rect
       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"
       id="rect2820"
       width="94.285713"
       height="20.714285"
       x="138"
       y="338.88007" />
    <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:Courier"
       x="162.09892"
       y="352.50122"
       id="text2814"><tspan
         sodipodi:role="line"
         id="tspan2816"
         x="162.09892"
         y="352.50122"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2864">3</tspan>: ff5d</tspan></text>
    <rect
       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"
       id="rect2830"
       width="94.285713"
       height="20.714285"
       x="138"
       y="292.00504" />
    <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:Courier"
       x="162.09892"
       y="305.62619"
       id="text2824"><tspan
         sodipodi:role="line"
         id="tspan2826"
         x="162.09892"
         y="305.62619"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan2862">4</tspan>: b57f</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 185.14286,478.50504 L 185.14286,454.34432"
       id="path2894"
       inkscape:connector-type="polyline" />
    <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 185.14286,431.63004 L 185.14286,407.46932"
       id="path2896"
       inkscape:connector-type="polyline" />
    <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 185.14286,384.75504 L 185.14286,360.59435"
       id="path2898"
       inkscape:connector-type="polyline" />
    <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 185.14286,337.88007 L 185.14286,313.71932"
       id="path2900"
       inkscape:connector-type="polyline" />
    <rect
       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"
       id="rect2863"
       width="94.285713"
       height="20.714285"
       x="91.428574"
       y="244.71933" />
    <text
       xml:space="preserve"
       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"
       x="116.09886"
       y="258.80865"
       id="text1965"
       transform="scale(1.000002,0.999998)"><tspan
         sodipodi:role="line"
         id="tspan1967"
         x="116.09886"
         y="258.80865"
         style="font-family:Courier"><tspan
   style="font-weight:bold"
   id="tspan1973">5</tspan>: ae13</tspan></text>
    <path
       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"
       d="M 173.95727,291.00504 L 149.75702,266.43361"
       id="path1971"
       inkscape:connector-type="polyline"
       inkscape:connection-end="#rect2863"
       inkscape:connection-start="#rect2830" />
    <rect
       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"
       id="rect2911"
       width="94.285995"
       height="20.714283"
       x="186.71414"
       y="198.6479" />
    <text
       xml:space="preserve"
       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"
       x="210.81311"
       y="212.26949"
       id="text2913"
       transform="scale(1.000002,0.999998)"><tspan
         sodipodi:role="line"
         id="tspan2915"
         x="210.81311"
         y="212.26949"
         style="font-family:Courier"><tspan
   id="tspan1966"
   style="font-weight:bold">6</tspan>: d2b5</tspan></text>
    <path
       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"
       d="M 191.06908,291.00504 L 227.93092,220.36218"
       id="path2919"
       inkscape:connector-type="polyline"
       inkscape:connection-start="#rect2830" />
    <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="295.28571"
       y="211.80988"
       id="text2871"><tspan
         sodipodi:role="line"
         id="tspan2873"
         x="295.28571"
         y="211.80988">tip (and 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="76"
       y="259.16046"
       id="text2875"><tspan
         sodipodi:role="line"
         id="tspan2877"
         x="76"
         y="259.16046"
         style="text-align:end;text-anchor:end">head</tspan></text>
  </g>
</svg>