hgbook
annotate en/tour-merge-merge.svg @ 307:fb5c0d56d7f1
Fix test 'tour'.
Executing 'tour' test now creates some files in /tmp to store the
revision numbers as they are created on the fly and appear in the output
files. When SVG files are to be converted to PNG or EPS files within the
Makefile, a tool 'fixsvg' will be invoked to substitute some placeholder
markup by the real version number which fits to the test output, before
the final conversion takes place.
Executing 'tour' test now creates some files in /tmp to store the
revision numbers as they are created on the fly and appear in the output
files. When SVG files are to be converted to PNG or EPS files within the
Makefile, a tool 'fixsvg' will be invoked to substitute some placeholder
markup by the real version number which fits to the test output, before
the final conversion takes place.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed Aug 20 22:15:35 2008 +0200 (2008-08-20) |
| parents | 321732566ac1 |
| children |
| 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@101 | 16 sodipodi:docname="tour-merge-merge.svg"> |
| bos@96 | 17 <defs |
| bos@96 | 18 id="defs4"> |
| bos@96 | 19 <marker |
| bos@97 | 20 inkscape:stockid="Arrow1Mstart" |
| bos@97 | 21 orient="auto" |
| bos@97 | 22 refY="0.0" |
| bos@97 | 23 refX="0.0" |
| bos@97 | 24 id="Arrow1Mstart" |
| bos@97 | 25 style="overflow:visible"> |
| bos@97 | 26 <path |
| bos@97 | 27 id="path2973" |
| bos@97 | 28 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 | 29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" |
| bos@97 | 30 transform="scale(0.4) translate(10,0)" /> |
| bos@97 | 31 </marker> |
| bos@97 | 32 <marker |
| bos@96 | 33 inkscape:stockid="Arrow1Mend" |
| bos@96 | 34 orient="auto" |
| bos@96 | 35 refY="0.0" |
| bos@96 | 36 refX="0.0" |
| bos@96 | 37 id="Arrow1Mend" |
| bos@96 | 38 style="overflow:visible;"> |
| bos@96 | 39 <path |
| bos@96 | 40 id="path3066" |
| bos@96 | 41 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 | 42 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" |
| bos@96 | 43 transform="scale(0.4) rotate(180) translate(10,0)" /> |
| bos@96 | 44 </marker> |
| bos@96 | 45 </defs> |
| bos@96 | 46 <sodipodi:namedview |
| bos@96 | 47 id="base" |
| bos@96 | 48 pagecolor="#ffffff" |
| bos@96 | 49 bordercolor="#666666" |
| bos@96 | 50 borderopacity="1.0" |
| bos@96 | 51 gridtolerance="10000" |
| bos@96 | 52 guidetolerance="10" |
| bos@96 | 53 objecttolerance="10" |
| bos@96 | 54 inkscape:pageopacity="0.0" |
| bos@96 | 55 inkscape:pageshadow="2" |
| bos@96 | 56 inkscape:zoom="1.4" |
| bos@100 | 57 inkscape:cx="247.53795" |
| bos@100 | 58 inkscape:cy="871.05738" |
| bos@96 | 59 inkscape:document-units="px" |
| bos@96 | 60 inkscape:current-layer="layer1" |
| bos@96 | 61 inkscape:window-width="906" |
| bos@96 | 62 inkscape:window-height="620" |
| bos@100 | 63 inkscape:window-x="38" |
| bos@100 | 64 inkscape:window-y="95" /> |
| bos@96 | 65 <metadata |
| bos@96 | 66 id="metadata7"> |
| bos@96 | 67 <rdf:RDF> |
| bos@96 | 68 <cc:Work |
| bos@96 | 69 rdf:about=""> |
| bos@96 | 70 <dc:format>image/svg+xml</dc:format> |
| bos@96 | 71 <dc:type |
| bos@96 | 72 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> |
| bos@96 | 73 </cc:Work> |
| bos@96 | 74 </rdf:RDF> |
| bos@96 | 75 </metadata> |
| bos@96 | 76 <g |
| bos@96 | 77 inkscape:label="Layer 1" |
| bos@96 | 78 inkscape:groupmode="layer" |
| bos@96 | 79 id="layer1"> |
| bos@100 | 80 <rect |
| bos@100 | 81 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@100 | 82 id="rect2995" |
| bos@100 | 83 width="94.285713" |
| bos@100 | 84 height="20.714285" |
| bos@100 | 85 x="532.85718" |
| bos@100 | 86 y="203.0479" /> |
| bos@98 | 87 <text |
| bos@98 | 88 xml:space="preserve" |
| bos@98 | 89 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 | 90 x="173.57143" |
| bos@98 | 91 y="443.79074" |
| bos@98 | 92 id="text2832"><tspan |
| bos@98 | 93 sodipodi:role="line" |
| bos@98 | 94 id="tspan2834" |
| bos@98 | 95 x="173.57143" |
| bos@98 | 96 y="443.79074" /></text> |
| bos@98 | 97 <rect |
| bos@98 | 98 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@100 | 99 id="rect2830" |
| bos@96 | 100 width="94.285713" |
| bos@96 | 101 height="20.714285" |
| bos@96 | 102 x="138" |
| bos@100 | 103 y="297.76227" /> |
| bos@96 | 104 <text |
| bos@96 | 105 xml:space="preserve" |
| bos@96 | 106 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 | 107 x="162.09892" |
| bos@100 | 108 y="311.38342" |
| bos@96 | 109 id="text2824"><tspan |
| bos@96 | 110 sodipodi:role="line" |
| bos@96 | 111 id="tspan2826" |
| bos@96 | 112 x="162.09892" |
| bos@100 | 113 y="311.38342" |
| bos@96 | 114 style="font-family:Courier"><tspan |
| bos@96 | 115 style="font-weight:bold" |
| hg@307 | 116 id="tspan2862">4</tspan>: REV4</tspan></text> |
| bos@98 | 117 <path |
| bos@98 | 118 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@100 | 119 d="M 185.14286,343.63731 L 185.14286,319.47656" |
| bos@96 | 120 id="path2900" |
| bos@96 | 121 inkscape:connector-type="polyline" /> |
| bos@98 | 122 <rect |
| bos@99 | 123 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 | 124 id="rect2863" |
| bos@99 | 125 width="94.285713" |
| bos@99 | 126 height="20.714285" |
| bos@99 | 127 x="91.428574" |
| bos@100 | 128 y="250.47656" /> |
| bos@98 | 129 <text |
| bos@98 | 130 xml:space="preserve" |
| bos@98 | 131 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 | 132 x="116.09886" |
| bos@100 | 133 y="264.56592" |
| bos@98 | 134 id="text1965" |
| bos@98 | 135 transform="scale(1.000002,0.999998)"><tspan |
| bos@98 | 136 sodipodi:role="line" |
| bos@98 | 137 id="tspan1967" |
| bos@99 | 138 x="116.09886" |
| bos@100 | 139 y="264.56592" |
| bos@98 | 140 style="font-family:Courier"><tspan |
| bos@98 | 141 style="font-weight:bold" |
| hg@307 | 142 id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> |
| bos@98 | 143 <path |
| bos@99 | 144 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@100 | 145 d="M 173.95727,296.76228 L 149.75702,272.19085" |
| bos@98 | 146 id="path1971" |
| bos@99 | 147 inkscape:connector-type="polyline" |
| bos@99 | 148 inkscape:connection-end="#rect2863" |
| bos@99 | 149 inkscape:connection-start="#rect2830" /> |
| bos@98 | 150 <rect |
| bos@98 | 151 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 | 152 id="rect2911" |
| bos@98 | 153 width="94.285995" |
| bos@98 | 154 height="20.714283" |
| bos@99 | 155 x="186.71414" |
| bos@100 | 156 y="204.40514" /> |
| bos@98 | 157 <text |
| bos@98 | 158 xml:space="preserve" |
| bos@98 | 159 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 | 160 x="210.81311" |
| bos@100 | 161 y="218.02673" |
| bos@98 | 162 id="text2913" |
| bos@98 | 163 transform="scale(1.000002,0.999998)"><tspan |
| bos@98 | 164 sodipodi:role="line" |
| bos@98 | 165 id="tspan2915" |
| bos@99 | 166 x="210.81311" |
| bos@100 | 167 y="218.02673" |
| bos@99 | 168 style="font-family:Courier"><tspan |
| bos@99 | 169 id="tspan1966" |
| hg@307 | 170 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> |
| bos@99 | 171 <path |
| bos@99 | 172 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@100 | 173 d="M 191.06908,296.76228 L 227.93092,226.11942" |
| bos@98 | 174 id="path2919" |
| bos@99 | 175 inkscape:connector-type="polyline" |
| bos@99 | 176 inkscape:connection-start="#rect2830" /> |
| bos@98 | 177 <text |
| bos@98 | 178 xml:space="preserve" |
| bos@98 | 179 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 | 180 x="295.28571" |
| bos@100 | 181 y="217.56711" |
| bos@99 | 182 id="text2871"><tspan |
| bos@99 | 183 sodipodi:role="line" |
| bos@99 | 184 id="tspan2873" |
| bos@99 | 185 x="295.28571" |
| bos@100 | 186 y="217.56711">tip (and head)</tspan></text> |
| bos@98 | 187 <text |
| bos@98 | 188 xml:space="preserve" |
| bos@98 | 189 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 | 190 x="76" |
| bos@100 | 191 y="264.91769" |
| bos@99 | 192 id="text2875"><tspan |
| bos@99 | 193 sodipodi:role="line" |
| bos@99 | 194 id="tspan2877" |
| bos@99 | 195 x="76" |
| bos@100 | 196 y="264.91769" |
| bos@99 | 197 style="text-align:end;text-anchor:end">head</tspan></text> |
| bos@100 | 198 <rect |
| bos@100 | 199 style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1" |
| bos@100 | 200 id="rect1913" |
| bos@100 | 201 width="94.285713" |
| bos@100 | 202 height="20.714285" |
| bos@100 | 203 x="138" |
| bos@100 | 204 y="156.90514" /> |
| bos@100 | 205 <path |
| bos@100 | 206 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" |
| bos@100 | 207 d="M 144.22399,249.47657 L 179.49029,178.61943" |
| bos@100 | 208 id="path1915" |
| bos@100 | 209 inkscape:connector-type="polyline" |
| bos@100 | 210 inkscape:connection-start="#rect2863" |
| bos@100 | 211 inkscape:connection-end="#rect1913" /> |
| bos@100 | 212 <path |
| bos@100 | 213 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" |
| bos@100 | 214 d="M 222.20966,203.40514 L 196.79033,178.61943" |
| bos@100 | 215 id="path1917" |
| bos@100 | 216 inkscape:connector-type="polyline" |
| bos@100 | 217 inkscape:connection-start="#rect2911" |
| bos@100 | 218 inkscape:connection-end="#rect1913" /> |
| bos@100 | 219 <text |
| bos@100 | 220 xml:space="preserve" |
| bos@100 | 221 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@100 | 222 x="166.16823" |
| bos@100 | 223 y="168.52228" |
| bos@100 | 224 id="text2806"><tspan |
| bos@100 | 225 sodipodi:role="line" |
| bos@100 | 226 id="tspan2808" |
| bos@100 | 227 x="166.16823" |
| bos@100 | 228 y="168.52228" |
| bos@100 | 229 style="font-family:Courier">merge</tspan></text> |
| bos@100 | 230 <text |
| bos@100 | 231 xml:space="preserve" |
| bos@100 | 232 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@100 | 233 x="246" |
| bos@100 | 234 y="162.63338" |
| bos@100 | 235 id="text2810"><tspan |
| bos@100 | 236 sodipodi:role="line" |
| bos@100 | 237 id="tspan2812" |
| bos@100 | 238 x="246" |
| bos@100 | 239 y="162.63338">working directory</tspan><tspan |
| bos@100 | 240 sodipodi:role="line" |
| bos@100 | 241 x="246" |
| bos@100 | 242 y="177.63338" |
| bos@100 | 243 id="tspan2814">during merge</tspan></text> |
| bos@100 | 244 <rect |
| bos@100 | 245 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@100 | 246 id="rect2816" |
| bos@100 | 247 width="94.285713" |
| bos@100 | 248 height="20.714285" |
| bos@100 | 249 x="483.14636" |
| bos@100 | 250 y="297.76227" /> |
| bos@100 | 251 <text |
| bos@100 | 252 xml:space="preserve" |
| bos@100 | 253 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@100 | 254 x="507.24527" |
| bos@100 | 255 y="311.38342" |
| bos@100 | 256 id="text2818"><tspan |
| bos@100 | 257 sodipodi:role="line" |
| bos@100 | 258 id="tspan2820" |
| bos@100 | 259 x="507.24527" |
| bos@100 | 260 y="311.38342" |
| bos@100 | 261 style="font-family:Courier"><tspan |
| bos@100 | 262 style="font-weight:bold" |
| hg@307 | 263 id="tspan2822">4</tspan>: REV4</tspan></text> |
| bos@100 | 264 <path |
| bos@100 | 265 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@100 | 266 d="M 530.28921,343.6373 L 530.28921,319.47655" |
| bos@100 | 267 id="path2824" |
| bos@100 | 268 inkscape:connector-type="polyline" /> |
| bos@100 | 269 <rect |
| bos@100 | 270 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@100 | 271 id="rect2826" |
| bos@100 | 272 width="94.285713" |
| bos@100 | 273 height="20.714285" |
| bos@100 | 274 x="436.57492" |
| bos@100 | 275 y="250.47656" /> |
| bos@100 | 276 <text |
| bos@100 | 277 xml:space="preserve" |
| bos@100 | 278 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@100 | 279 x="461.24484" |
| bos@100 | 280 y="264.56613" |
| bos@100 | 281 id="text2828" |
| bos@100 | 282 transform="scale(1.000002,0.999998)"><tspan |
| bos@100 | 283 sodipodi:role="line" |
| bos@100 | 284 id="tspan2830" |
| bos@100 | 285 x="461.24484" |
| bos@100 | 286 y="264.56613" |
| bos@100 | 287 style="font-family:Courier"><tspan |
| bos@100 | 288 style="font-weight:bold" |
| hg@307 | 289 id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> |
| bos@100 | 290 <path |
| bos@100 | 291 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@100 | 292 d="M 519.10362,296.76227 L 494.90337,272.19084" |
| bos@100 | 293 id="path2834" |
| bos@100 | 294 inkscape:connector-type="polyline" /> |
| bos@100 | 295 <rect |
| bos@100 | 296 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@100 | 297 id="rect2836" |
| bos@100 | 298 width="94.285995" |
| bos@100 | 299 height="20.714283" |
| bos@100 | 300 x="483.14001" |
| bos@100 | 301 y="156.548" /> |
| bos@100 | 302 <text |
| bos@100 | 303 xml:space="preserve" |
| bos@100 | 304 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@100 | 305 x="555.95911" |
| bos@100 | 306 y="218.02698" |
| bos@100 | 307 id="text2838" |
| bos@100 | 308 transform="scale(1.000002,0.999998)"><tspan |
| bos@100 | 309 sodipodi:role="line" |
| bos@100 | 310 id="tspan2840" |
| bos@100 | 311 x="555.95911" |
| bos@100 | 312 y="218.02698" |
| bos@100 | 313 style="font-family:Courier"><tspan |
| bos@100 | 314 id="tspan2842" |
| hg@307 | 315 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> |
| bos@100 | 316 <path |
| bos@100 | 317 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@100 | 318 d="M 536.21543,296.76227 L 574.03453,224.76218" |
| bos@100 | 319 id="path2844" |
| bos@100 | 320 inkscape:connector-type="polyline" /> |
| bos@100 | 321 <text |
| bos@100 | 322 xml:space="preserve" |
| bos@100 | 323 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@100 | 324 x="594.43207" |
| bos@100 | 325 y="169.78796" |
| bos@100 | 326 id="text2846"><tspan |
| bos@100 | 327 sodipodi:role="line" |
| bos@100 | 328 id="tspan2848" |
| bos@100 | 329 x="594.43207" |
| bos@100 | 330 y="169.78796">tip</tspan></text> |
| bos@100 | 331 <path |
| bos@100 | 332 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" |
| bos@100 | 333 d="M 489.37034,249.47656 L 524.65575,178.26229" |
| bos@100 | 334 id="path2856" |
| bos@100 | 335 inkscape:connector-type="polyline" |
| bos@100 | 336 inkscape:connection-end="#rect2836" /> |
| bos@100 | 337 <path |
| bos@100 | 338 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" |
| bos@100 | 339 d="M 567.85714,202.0479 L 542.42591,178.26229" |
| bos@100 | 340 id="path2858" |
| bos@100 | 341 inkscape:connector-type="polyline" |
| bos@100 | 342 inkscape:connection-end="#rect2836" |
| bos@100 | 343 inkscape:connection-start="#rect2995" /> |
| bos@100 | 344 <text |
| bos@100 | 345 xml:space="preserve" |
| bos@100 | 346 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@100 | 347 x="504.54507" |
| bos@100 | 348 y="170.39714" |
| bos@100 | 349 id="text2860"><tspan |
| bos@100 | 350 sodipodi:role="line" |
| bos@100 | 351 id="tspan2863" |
| bos@100 | 352 x="504.54507" |
| bos@100 | 353 y="170.39714" |
| bos@100 | 354 style="font-family:Courier"><tspan |
| bos@100 | 355 style="font-weight:bold" |
| hg@307 | 356 id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> |
| bos@100 | 357 <text |
| bos@100 | 358 xml:space="preserve" |
| bos@100 | 359 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@100 | 360 x="90.323105" |
| bos@100 | 361 y="120.21933" |
| bos@100 | 362 id="text2929"><tspan |
| bos@100 | 363 sodipodi:role="line" |
| bos@100 | 364 id="tspan2931" |
| bos@100 | 365 x="90.323105" |
| bos@100 | 366 y="120.21933" |
| bos@100 | 367 style="font-weight:bold">Working directory during merge</tspan></text> |
| bos@100 | 368 <text |
| bos@100 | 369 xml:space="preserve" |
| bos@100 | 370 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@100 | 371 x="435.35226" |
| bos@100 | 372 y="120.21933" |
| bos@100 | 373 id="text2937"><tspan |
| bos@100 | 374 sodipodi:role="line" |
| bos@100 | 375 id="tspan2939" |
| bos@100 | 376 x="435.35226" |
| bos@100 | 377 y="120.21933" |
| bos@100 | 378 style="font-weight:bold">Repository after merge committed</tspan></text> |
| bos@96 | 379 </g> |
| bos@96 | 380 </svg> |
