hgbook

annotate ja/wdir-after-commit.svg @ 846:29b47af6a275

Adding KDiff3 screenshot.
author gpiancastelli
date Sat Aug 22 17:02:37 2009 +0200 (2009-08-22)
parents
children
rev   line source
foozy@708 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
foozy@708 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
foozy@708 3 <svg
foozy@708 4 xmlns:dc="http://purl.org/dc/elements/1.1/"
foozy@708 5 xmlns:cc="http://web.resource.org/cc/"
foozy@708 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
foozy@708 7 xmlns:svg="http://www.w3.org/2000/svg"
foozy@708 8 xmlns="http://www.w3.org/2000/svg"
foozy@708 9 xmlns:xlink="http://www.w3.org/1999/xlink"
foozy@708 10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
foozy@708 11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
foozy@708 12 width="744.09448819"
foozy@708 13 height="1052.3622047"
foozy@708 14 id="svg5971"
foozy@708 15 sodipodi:version="0.32"
foozy@708 16 inkscape:version="0.44.1"
foozy@708 17 sodipodi:docbase="/home/bos/hg/hgbook/en"
foozy@708 18 sodipodi:docname="wdir-after-commit.svg">
foozy@708 19 <defs
foozy@708 20 id="defs5973">
foozy@708 21 <linearGradient
foozy@708 22 inkscape:collect="always"
foozy@708 23 xlink:href="#linearGradient6049"
foozy@708 24 id="linearGradient6445"
foozy@708 25 gradientUnits="userSpaceOnUse"
foozy@708 26 gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)"
foozy@708 27 x1="333.91171"
foozy@708 28 y1="488.79077"
foozy@708 29 x2="508.94543"
foozy@708 30 y2="263.79077" />
foozy@708 31 <marker
foozy@708 32 inkscape:stockid="Arrow1Mstart"
foozy@708 33 orient="auto"
foozy@708 34 refY="0.0"
foozy@708 35 refX="0.0"
foozy@708 36 id="Arrow1Mstart"
foozy@708 37 style="overflow:visible">
foozy@708 38 <path
foozy@708 39 id="path4855"
foozy@708 40 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 "
foozy@708 41 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
foozy@708 42 transform="scale(0.4) translate(10,0)" />
foozy@708 43 </marker>
foozy@708 44 <linearGradient
foozy@708 45 id="linearGradient6049">
foozy@708 46 <stop
foozy@708 47 style="stop-color:#686868;stop-opacity:1;"
foozy@708 48 offset="0"
foozy@708 49 id="stop6051" />
foozy@708 50 <stop
foozy@708 51 style="stop-color:#f0f0f0;stop-opacity:1;"
foozy@708 52 offset="1"
foozy@708 53 id="stop6053" />
foozy@708 54 </linearGradient>
foozy@708 55 <marker
foozy@708 56 inkscape:stockid="Arrow1Mend"
foozy@708 57 orient="auto"
foozy@708 58 refY="0.0"
foozy@708 59 refX="0.0"
foozy@708 60 id="Arrow1Mend"
foozy@708 61 style="overflow:visible;">
foozy@708 62 <path
foozy@708 63 id="path4852"
foozy@708 64 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 "
foozy@708 65 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
foozy@708 66 transform="scale(0.4) rotate(180) translate(10,0)" />
foozy@708 67 </marker>
foozy@708 68 <linearGradient
foozy@708 69 inkscape:collect="always"
foozy@708 70 xlink:href="#linearGradient6049"
foozy@708 71 id="linearGradient6083"
foozy@708 72 gradientUnits="userSpaceOnUse"
foozy@708 73 gradientTransform="translate(-240.0462,-8.633237e-6)"
foozy@708 74 x1="333.91171"
foozy@708 75 y1="488.79077"
foozy@708 76 x2="508.94543"
foozy@708 77 y2="263.79077" />
foozy@708 78 <linearGradient
foozy@708 79 inkscape:collect="always"
foozy@708 80 xlink:href="#linearGradient6049"
foozy@708 81 id="linearGradient6142"
foozy@708 82 gradientUnits="userSpaceOnUse"
foozy@708 83 gradientTransform="translate(-42.00893,-30.49544)"
foozy@708 84 x1="333.91171"
foozy@708 85 y1="488.79077"
foozy@708 86 x2="508.94543"
foozy@708 87 y2="263.79077" />
foozy@708 88 <linearGradient
foozy@708 89 inkscape:collect="always"
foozy@708 90 xlink:href="#linearGradient6049"
foozy@708 91 id="linearGradient6193"
foozy@708 92 gradientUnits="userSpaceOnUse"
foozy@708 93 gradientTransform="translate(-240.0462,-8.633237e-6)"
foozy@708 94 x1="333.91171"
foozy@708 95 y1="488.79077"
foozy@708 96 x2="508.94543"
foozy@708 97 y2="263.79077" />
foozy@708 98 <linearGradient
foozy@708 99 inkscape:collect="always"
foozy@708 100 xlink:href="#linearGradient6049"
foozy@708 101 id="linearGradient6216"
foozy@708 102 gradientUnits="userSpaceOnUse"
foozy@708 103 gradientTransform="translate(-6.0462,-0.664361)"
foozy@708 104 x1="333.91171"
foozy@708 105 y1="488.79077"
foozy@708 106 x2="508.94543"
foozy@708 107 y2="263.79077" />
foozy@708 108 <linearGradient
foozy@708 109 inkscape:collect="always"
foozy@708 110 xlink:href="#linearGradient6049"
foozy@708 111 id="linearGradient6232"
foozy@708 112 gradientUnits="userSpaceOnUse"
foozy@708 113 gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)"
foozy@708 114 x1="333.91171"
foozy@708 115 y1="488.79077"
foozy@708 116 x2="508.94543"
foozy@708 117 y2="263.79077" />
foozy@708 118 <linearGradient
foozy@708 119 inkscape:collect="always"
foozy@708 120 xlink:href="#linearGradient6049"
foozy@708 121 id="linearGradient6772"
foozy@708 122 gradientUnits="userSpaceOnUse"
foozy@708 123 gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)"
foozy@708 124 x1="333.91171"
foozy@708 125 y1="488.79077"
foozy@708 126 x2="508.94543"
foozy@708 127 y2="263.79077" />
foozy@708 128 </defs>
foozy@708 129 <sodipodi:namedview
foozy@708 130 id="base"
foozy@708 131 pagecolor="#ffffff"
foozy@708 132 bordercolor="#666666"
foozy@708 133 borderopacity="1.0"
foozy@708 134 gridtolerance="10000"
foozy@708 135 guidetolerance="10"
foozy@708 136 objecttolerance="10"
foozy@708 137 inkscape:pageopacity="0.0"
foozy@708 138 inkscape:pageshadow="2"
foozy@708 139 inkscape:zoom="0.90509668"
foozy@708 140 inkscape:cx="390.0539"
foozy@708 141 inkscape:cy="690.49342"
foozy@708 142 inkscape:document-units="px"
foozy@708 143 inkscape:current-layer="layer1"
foozy@708 144 showguides="true"
foozy@708 145 inkscape:guide-bbox="true"
foozy@708 146 inkscape:window-width="906"
foozy@708 147 inkscape:window-height="620"
foozy@708 148 inkscape:window-x="0"
foozy@708 149 inkscape:window-y="25">
foozy@708 150 <sodipodi:guide
foozy@708 151 orientation="vertical"
foozy@708 152 position="-1.4285714"
foozy@708 153 id="guide6022" />
foozy@708 154 </sodipodi:namedview>
foozy@708 155 <metadata
foozy@708 156 id="metadata5976">
foozy@708 157 <rdf:RDF>
foozy@708 158 <cc:Work
foozy@708 159 rdf:about="">
foozy@708 160 <dc:format>image/svg+xml</dc:format>
foozy@708 161 <dc:type
foozy@708 162 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
foozy@708 163 </cc:Work>
foozy@708 164 </rdf:RDF>
foozy@708 165 </metadata>
foozy@708 166 <g
foozy@708 167 inkscape:label="Layer 1"
foozy@708 168 inkscape:groupmode="layer"
foozy@708 169 id="layer1">
foozy@708 170 <rect
foozy@708 171 y="245.98355"
foozy@708 172 x="328.23956"
foozy@708 173 height="258.57144"
foozy@708 174 width="174.28572"
foozy@708 175 id="rect6047"
foozy@708 176 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" />
foozy@708 177 <g
foozy@708 178 id="g6261"
foozy@708 179 transform="translate(234,0)">
foozy@708 180 <rect
foozy@708 181 y="258.7149"
foozy@708 182 x="114.11369"
foozy@708 183 height="44.537449"
foozy@708 184 width="134.53746"
foozy@708 185 id="rect5983"
foozy@708 186 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" />
foozy@708 187 <text
foozy@708 188 id="text5985"
foozy@708 189 y="284.47562"
foozy@708 190 x="138.7962"
foozy@708 191 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"
foozy@708 192 xml:space="preserve"><tspan
foozy@708 193 style="font-family:Courier"
foozy@708 194 y="284.47562"
foozy@708 195 x="138.7962"
foozy@708 196 id="tspan5987"
foozy@708 197 sodipodi:role="line">dfbbb33f3fa3</tspan></text>
foozy@708 198 </g>
foozy@708 199 <rect
foozy@708 200 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"
foozy@708 201 id="rect5996"
foozy@708 202 width="134.53746"
foozy@708 203 height="44.537449"
foozy@708 204 x="348.11371"
foozy@708 205 y="320.38159" />
foozy@708 206 <text
foozy@708 207 xml:space="preserve"
foozy@708 208 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"
foozy@708 209 x="372.7962"
foozy@708 210 y="346.1423"
foozy@708 211 id="text5998"><tspan
foozy@708 212 sodipodi:role="line"
foozy@708 213 id="tspan6000"
foozy@708 214 x="372.7962"
foozy@708 215 y="346.1423"
foozy@708 216 style="font-family:Courier">e7639888bb2f</tspan></text>
foozy@708 217 <rect
foozy@708 218 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"
foozy@708 219 id="rect6004"
foozy@708 220 width="134.53746"
foozy@708 221 height="44.537449"
foozy@708 222 x="348.11371"
foozy@708 223 y="382.04825" />
foozy@708 224 <text
foozy@708 225 xml:space="preserve"
foozy@708 226 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"
foozy@708 227 x="370.65421"
foozy@708 228 y="407.80896"
foozy@708 229 id="text6006"><tspan
foozy@708 230 sodipodi:role="line"
foozy@708 231 id="tspan6008"
foozy@708 232 x="370.65421"
foozy@708 233 y="407.80896"
foozy@708 234 style="font-family:Courier">7b064d8bac5e</tspan></text>
foozy@708 235 <path
foozy@708 236 inkscape:connector-type="polyline"
foozy@708 237 id="path6018"
foozy@708 238 d="M 415.38242,303.62646 L 415.38242,320.00744"
foozy@708 239 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" />
foozy@708 240 <path
foozy@708 241 inkscape:connection-end="#rect6004"
foozy@708 242 inkscape:connector-type="polyline"
foozy@708 243 id="path6020"
foozy@708 244 d="M 415.38242,365.29315 L 415.38243,381.67412"
foozy@708 245 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" />
foozy@708 246 <rect
foozy@708 247 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"
foozy@708 248 id="rect6039"
foozy@708 249 width="134.53746"
foozy@708 250 height="44.537449"
foozy@708 251 x="348.11359"
foozy@708 252 y="443.71487" />
foozy@708 253 <text
foozy@708 254 xml:space="preserve"
foozy@708 255 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"
foozy@708 256 x="372.79706"
foozy@708 257 y="469.47556"
foozy@708 258 id="text6041"><tspan
foozy@708 259 sodipodi:role="line"
foozy@708 260 id="tspan6043"
foozy@708 261 x="372.79706"
foozy@708 262 y="469.47556"
foozy@708 263 style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text>
foozy@708 264 <path
foozy@708 265 inkscape:connection-end="#rect6039"
foozy@708 266 inkscape:connector-type="polyline"
foozy@708 267 id="path6045"
foozy@708 268 d="M 415.38238,426.95981 L 415.38235,443.34087"
foozy@708 269 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" />
foozy@708 270 <text
foozy@708 271 xml:space="preserve"
foozy@708 272 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"
foozy@708 273 x="327.66046"
foozy@708 274 y="231.36218"
foozy@708 275 id="text6102"><tspan
foozy@708 276 sodipodi:role="line"
foozy@708 277 id="tspan6104"
foozy@708 278 x="327.66046"
foozy@708 279 y="231.36218">History in repository</tspan></text>
foozy@708 280 <rect
foozy@708 281 y="245.94225"
foozy@708 282 x="557.28418"
foozy@708 283 height="204.51619"
foozy@708 284 width="174.36833"
foozy@708 285 id="rect6140"
foozy@708 286 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" />
foozy@708 287 <g
foozy@708 288 id="g6130"
foozy@708 289 transform="translate(262.3254,24.38544)">
foozy@708 290 <rect
foozy@708 291 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"
foozy@708 292 id="rect6106"
foozy@708 293 width="134.53746"
foozy@708 294 height="44.537449"
foozy@708 295 x="314.87415"
foozy@708 296 y="257.95059" />
foozy@708 297 <text
foozy@708 298 xml:space="preserve"
foozy@708 299 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"
foozy@708 300 x="339.55664"
foozy@708 301 y="283.7113"
foozy@708 302 id="text6108"><tspan
foozy@708 303 sodipodi:role="line"
foozy@708 304 id="tspan6110"
foozy@708 305 x="339.55664"
foozy@708 306 y="283.7113"
foozy@708 307 style="font-family:Courier">dfbbb33f3fa3</tspan></text>
foozy@708 308 </g>
foozy@708 309 <g
foozy@708 310 id="g6135"
foozy@708 311 transform="translate(263.0396,49.83106)">
foozy@708 312 <rect
foozy@708 313 inkscape:transform-center-y="102.85714"
foozy@708 314 inkscape:transform-center-x="129.28571"
foozy@708 315 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"
foozy@708 316 id="rect6112"
foozy@708 317 width="134.53746"
foozy@708 318 height="44.537449"
foozy@708 319 x="314.15985"
foozy@708 320 y="326.52203" />
foozy@708 321 <text
foozy@708 322 inkscape:transform-center-y="102.7311"
foozy@708 323 inkscape:transform-center-x="128.69672"
foozy@708 324 xml:space="preserve"
foozy@708 325 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"
foozy@708 326 x="338.84335"
foozy@708 327 y="352.28271"
foozy@708 328 id="text6114"><tspan
foozy@708 329 sodipodi:role="line"
foozy@708 330 id="tspan6116"
foozy@708 331 x="338.84335"
foozy@708 332 y="352.28271"
foozy@708 333 style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text>
foozy@708 334 </g>
foozy@708 335 <text
foozy@708 336 xml:space="preserve"
foozy@708 337 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"
foozy@708 338 x="576.63208"
foozy@708 339 y="270.479"
foozy@708 340 id="text6118"><tspan
foozy@708 341 sodipodi:role="line"
foozy@708 342 id="tspan6120"
foozy@708 343 x="576.63208"
foozy@708 344 y="270.479">First parent</tspan></text>
foozy@708 345 <text
foozy@708 346 xml:space="preserve"
foozy@708 347 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"
foozy@708 348 x="576.07544"
foozy@708 349 y="364.49615"
foozy@708 350 id="text6122"><tspan
foozy@708 351 sodipodi:role="line"
foozy@708 352 id="tspan6124"
foozy@708 353 x="576.07544"
foozy@708 354 y="364.49615">Second parent</tspan></text>
foozy@708 355 <text
foozy@708 356 xml:space="preserve"
foozy@708 357 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"
foozy@708 358 x="556.61743"
foozy@708 359 y="231.36218"
foozy@708 360 id="text6195"><tspan
foozy@708 361 sodipodi:role="line"
foozy@708 362 id="tspan6197"
foozy@708 363 x="556.61743"
foozy@708 364 y="231.36218">Parents of working directory</tspan></text>
foozy@708 365 <path
foozy@708 366 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"
foozy@708 367 d="M 576.82542,297.63008 L 483.02528,287.95831"
foozy@708 368 id="path6266"
foozy@708 369 inkscape:connector-type="polyline"
foozy@708 370 inkscape:connection-start="#g6130"
foozy@708 371 inkscape:connection-end="#g6261" />
foozy@708 372 <path
foozy@708 373 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 374 d="M 665.12232,418.17579 L 665.12232,418.17579"
foozy@708 375 id="path6270"
foozy@708 376 inkscape:connector-type="polyline" />
foozy@708 377 <text
foozy@708 378 xml:space="preserve"
foozy@708 379 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"
foozy@708 380 x="316.86407"
foozy@708 381 y="275.6496"
foozy@708 382 id="text6573"><tspan
foozy@708 383 sodipodi:role="line"
foozy@708 384 id="tspan6575"
foozy@708 385 x="316.86407"
foozy@708 386 y="275.6496"
foozy@708 387 style="text-align:end;text-anchor:end">New</tspan><tspan
foozy@708 388 sodipodi:role="line"
foozy@708 389 x="316.86407"
foozy@708 390 y="290.6496"
foozy@708 391 id="tspan6577"
foozy@708 392 style="text-align:end;text-anchor:end">changeset</tspan></text>
foozy@708 393 </g>
foozy@708 394 </svg>