hgbook

annotate en/tour-merge-pull.svg @ 231:28ddbf9f3729

find changesets by author, revision, files, or words in the commit message
Use new \hgxcmd and \hgxopt commands in a few places.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun May 27 09:39:58 2007 -0700 (2007-05-27)
parents 3f3dd60695cb
children fb5c0d56d7f1
rev   line source
bos@96 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
bos@96 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
bos@96 3 <svg
bos@96 4 xmlns:dc="http://purl.org/dc/elements/1.1/"
bos@96 5 xmlns:cc="http://web.resource.org/cc/"
bos@96 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bos@96 7 xmlns:svg="http://www.w3.org/2000/svg"
bos@96 8 xmlns="http://www.w3.org/2000/svg"
bos@96 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
bos@96 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
bos@96 11 width="744.09448819"
bos@96 12 height="1052.3622047"
bos@96 13 id="svg2"
bos@96 14 sodipodi:version="0.32"
bos@96 15 inkscape:version="0.44.1"
bos@99 16 sodipodi:docname="tour-merge-pull.svg"
bos@99 17 sodipodi:docbase="/home/bos/hg/hgbook/en">
bos@96 18 <defs
bos@96 19 id="defs4">
bos@96 20 <marker
bos@97 21 inkscape:stockid="Arrow1Mstart"
bos@97 22 orient="auto"
bos@97 23 refY="0.0"
bos@97 24 refX="0.0"
bos@97 25 id="Arrow1Mstart"
bos@97 26 style="overflow:visible">
bos@97 27 <path
bos@97 28 id="path2973"
bos@97 29 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@97 30 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
bos@97 31 transform="scale(0.4) translate(10,0)" />
bos@97 32 </marker>
bos@97 33 <marker
bos@96 34 inkscape:stockid="Arrow1Mend"
bos@96 35 orient="auto"
bos@96 36 refY="0.0"
bos@96 37 refX="0.0"
bos@96 38 id="Arrow1Mend"
bos@96 39 style="overflow:visible;">
bos@96 40 <path
bos@96 41 id="path3066"
bos@96 42 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@96 43 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
bos@96 44 transform="scale(0.4) rotate(180) translate(10,0)" />
bos@96 45 </marker>
bos@96 46 </defs>
bos@96 47 <sodipodi:namedview
bos@96 48 id="base"
bos@96 49 pagecolor="#ffffff"
bos@96 50 bordercolor="#666666"
bos@96 51 borderopacity="1.0"
bos@96 52 gridtolerance="10000"
bos@96 53 guidetolerance="10"
bos@96 54 objecttolerance="10"
bos@96 55 inkscape:pageopacity="0.0"
bos@96 56 inkscape:pageshadow="2"
bos@96 57 inkscape:zoom="1.4"
bos@99 58 inkscape:cx="233.63208"
bos@99 59 inkscape:cy="832.54381"
bos@96 60 inkscape:document-units="px"
bos@96 61 inkscape:current-layer="layer1"
bos@96 62 inkscape:window-width="906"
bos@96 63 inkscape:window-height="620"
bos@99 64 inkscape:window-x="237"
bos@99 65 inkscape:window-y="103" />
bos@96 66 <metadata
bos@96 67 id="metadata7">
bos@96 68 <rdf:RDF>
bos@96 69 <cc:Work
bos@96 70 rdf:about="">
bos@96 71 <dc:format>image/svg+xml</dc:format>
bos@96 72 <dc:type
bos@96 73 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
bos@96 74 </cc:Work>
bos@96 75 </rdf:RDF>
bos@96 76 </metadata>
bos@96 77 <g
bos@96 78 inkscape:label="Layer 1"
bos@96 79 inkscape:groupmode="layer"
bos@96 80 id="layer1">
bos@98 81 <text
bos@98 82 xml:space="preserve"
bos@98 83 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"
bos@98 84 x="173.57143"
bos@98 85 y="443.79074"
bos@98 86 id="text2832"><tspan
bos@98 87 sodipodi:role="line"
bos@98 88 id="tspan2834"
bos@98 89 x="173.57143"
bos@98 90 y="443.79074" /></text>
bos@98 91 <rect
bos@98 92 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"
bos@96 93 id="rect1878"
bos@96 94 width="94.285713"
bos@96 95 height="20.714285"
bos@96 96 x="138"
bos@96 97 y="479.50504" />
bos@96 98 <text
bos@96 99 xml:space="preserve"
bos@96 100 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"
bos@96 101 x="162.09892"
bos@96 102 y="493.12619"
bos@96 103 id="text1872"><tspan
bos@96 104 sodipodi:role="line"
bos@96 105 id="tspan1874"
bos@96 106 x="162.09892"
bos@96 107 y="493.12619"
bos@96 108 style="font-family:Courier"><tspan
bos@96 109 style="font-weight:bold"
bos@96 110 id="tspan1876">0</tspan>: 0a04</tspan></text>
bos@96 111 <rect
bos@98 112 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"
bos@96 113 id="rect2800"
bos@96 114 width="94.285713"
bos@96 115 height="20.714285"
bos@96 116 x="138"
bos@96 117 y="432.63004" />
bos@96 118 <text
bos@96 119 xml:space="preserve"
bos@96 120 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"
bos@96 121 x="162.09892"
bos@96 122 y="446.25119"
bos@96 123 id="text2794"><tspan
bos@96 124 sodipodi:role="line"
bos@96 125 id="tspan2796"
bos@96 126 x="162.09892"
bos@96 127 y="446.25119"
bos@96 128 style="font-family:Courier"><tspan
bos@96 129 id="tspan2868"
bos@96 130 style="font-weight:bold">1</tspan>: 82e5</tspan></text>
bos@96 131 <rect
bos@98 132 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"
bos@96 133 id="rect2810"
bos@96 134 width="94.285713"
bos@96 135 height="20.714285"
bos@96 136 x="138"
bos@96 137 y="385.75504" />
bos@96 138 <text
bos@96 139 xml:space="preserve"
bos@96 140 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"
bos@96 141 x="162.09892"
bos@96 142 y="399.37619"
bos@96 143 id="text2804"><tspan
bos@96 144 sodipodi:role="line"
bos@96 145 id="tspan2806"
bos@96 146 x="162.09892"
bos@96 147 y="399.37619"
bos@96 148 style="font-family:Courier"><tspan
bos@96 149 style="font-weight:bold"
bos@96 150 id="tspan2866">2</tspan>: 057d</tspan></text>
bos@96 151 <rect
bos@98 152 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"
bos@96 153 id="rect2820"
bos@96 154 width="94.285713"
bos@96 155 height="20.714285"
bos@96 156 x="138"
bos@96 157 y="338.88007" />
bos@96 158 <text
bos@96 159 xml:space="preserve"
bos@96 160 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"
bos@96 161 x="162.09892"
bos@96 162 y="352.50122"
bos@96 163 id="text2814"><tspan
bos@96 164 sodipodi:role="line"
bos@96 165 id="tspan2816"
bos@96 166 x="162.09892"
bos@96 167 y="352.50122"
bos@96 168 style="font-family:Courier"><tspan
bos@96 169 style="font-weight:bold"
bos@96 170 id="tspan2864">3</tspan>: ff5d</tspan></text>
bos@96 171 <rect
bos@98 172 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"
bos@96 173 id="rect2830"
bos@96 174 width="94.285713"
bos@96 175 height="20.714285"
bos@96 176 x="138"
bos@96 177 y="292.00504" />
bos@96 178 <text
bos@96 179 xml:space="preserve"
bos@96 180 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"
bos@96 181 x="162.09892"
bos@96 182 y="305.62619"
bos@96 183 id="text2824"><tspan
bos@96 184 sodipodi:role="line"
bos@96 185 id="tspan2826"
bos@96 186 x="162.09892"
bos@96 187 y="305.62619"
bos@96 188 style="font-family:Courier"><tspan
bos@96 189 style="font-weight:bold"
bos@96 190 id="tspan2862">4</tspan>: b57f</tspan></text>
bos@98 191 <path
bos@98 192 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"
bos@96 193 d="M 185.14286,478.50504 L 185.14286,454.34432"
bos@96 194 id="path2894"
bos@96 195 inkscape:connector-type="polyline" />
bos@96 196 <path
bos@98 197 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"
bos@96 198 d="M 185.14286,431.63004 L 185.14286,407.46932"
bos@96 199 id="path2896"
bos@96 200 inkscape:connector-type="polyline" />
bos@96 201 <path
bos@98 202 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"
bos@96 203 d="M 185.14286,384.75504 L 185.14286,360.59435"
bos@96 204 id="path2898"
bos@96 205 inkscape:connector-type="polyline" />
bos@96 206 <path
bos@98 207 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"
bos@96 208 d="M 185.14286,337.88007 L 185.14286,313.71932"
bos@96 209 id="path2900"
bos@96 210 inkscape:connector-type="polyline" />
bos@98 211 <rect
bos@99 212 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"
bos@99 213 id="rect2863"
bos@99 214 width="94.285713"
bos@99 215 height="20.714285"
bos@99 216 x="91.428574"
bos@99 217 y="244.71933" />
bos@98 218 <text
bos@98 219 xml:space="preserve"
bos@98 220 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"
bos@99 221 x="116.09886"
bos@98 222 y="258.80865"
bos@98 223 id="text1965"
bos@98 224 transform="scale(1.000002,0.999998)"><tspan
bos@98 225 sodipodi:role="line"
bos@98 226 id="tspan1967"
bos@99 227 x="116.09886"
bos@98 228 y="258.80865"
bos@98 229 style="font-family:Courier"><tspan
bos@98 230 style="font-weight:bold"
bos@98 231 id="tspan1973">5</tspan>: ae13</tspan></text>
bos@98 232 <path
bos@99 233 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"
bos@99 234 d="M 173.95727,291.00504 L 149.75702,266.43361"
bos@98 235 id="path1971"
bos@99 236 inkscape:connector-type="polyline"
bos@99 237 inkscape:connection-end="#rect2863"
bos@99 238 inkscape:connection-start="#rect2830" />
bos@98 239 <rect
bos@98 240 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"
bos@98 241 id="rect2911"
bos@98 242 width="94.285995"
bos@98 243 height="20.714283"
bos@99 244 x="186.71414"
bos@99 245 y="198.6479" />
bos@98 246 <text
bos@98 247 xml:space="preserve"
bos@98 248 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"
bos@99 249 x="210.81311"
bos@99 250 y="212.26949"
bos@98 251 id="text2913"
bos@98 252 transform="scale(1.000002,0.999998)"><tspan
bos@98 253 sodipodi:role="line"
bos@98 254 id="tspan2915"
bos@99 255 x="210.81311"
bos@99 256 y="212.26949"
bos@99 257 style="font-family:Courier"><tspan
bos@99 258 id="tspan1966"
bos@99 259 style="font-weight:bold">6</tspan>: d2b5</tspan></text>
bos@99 260 <path
bos@99 261 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"
bos@99 262 d="M 191.06908,291.00504 L 227.93092,220.36218"
bos@98 263 id="path2919"
bos@99 264 inkscape:connector-type="polyline"
bos@99 265 inkscape:connection-start="#rect2830" />
bos@98 266 <text
bos@98 267 xml:space="preserve"
bos@98 268 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@99 269 x="295.28571"
bos@99 270 y="211.80988"
bos@99 271 id="text2871"><tspan
bos@99 272 sodipodi:role="line"
bos@99 273 id="tspan2873"
bos@99 274 x="295.28571"
bos@99 275 y="211.80988">tip (and head)</tspan></text>
bos@98 276 <text
bos@98 277 xml:space="preserve"
bos@98 278 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@99 279 x="76"
bos@99 280 y="259.16046"
bos@99 281 id="text2875"><tspan
bos@99 282 sodipodi:role="line"
bos@99 283 id="tspan2877"
bos@99 284 x="76"
bos@99 285 y="259.16046"
bos@99 286 style="text-align:end;text-anchor:end">head</tspan></text>
bos@96 287 </g>
bos@96 288 </svg>