hgbook
changeset 628:0e3d8f66bbb7
Rename en/figs to en/images
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Thu Mar 12 15:58:38 2009 +0800 (2009-03-12) |
parents | 8271c8891b0e |
children | bae6d1503482 |
files | Makefile en/figs/feature-branches.dot en/figs/filelog.svg en/figs/kdiff3.png en/figs/metadata.svg en/figs/mq-stack.svg en/figs/note.png en/figs/revlog.svg en/figs/snapshot.svg en/figs/tour-history.svg en/figs/tour-merge-conflict.svg en/figs/tour-merge-merge.svg en/figs/tour-merge-pull.svg en/figs/tour-merge-sep-repos.svg en/figs/undo-manual-merge.dot en/figs/undo-manual.dot en/figs/undo-non-tip.dot en/figs/undo-simple.dot en/figs/wdir-after-commit.svg en/figs/wdir-branch.svg en/figs/wdir-merge.svg en/figs/wdir-pre-branch.svg en/figs/wdir.svg en/images/feature-branches.dot en/images/filelog.svg en/images/kdiff3.png en/images/metadata.svg en/images/mq-stack.svg en/images/note.png en/images/revlog.svg en/images/snapshot.svg en/images/tour-history.svg en/images/tour-merge-conflict.svg en/images/tour-merge-merge.svg en/images/tour-merge-pull.svg en/images/tour-merge-sep-repos.svg en/images/undo-manual-merge.dot en/images/undo-manual.dot en/images/undo-non-tip.dot en/images/undo-simple.dot en/images/wdir-after-commit.svg en/images/wdir-branch.svg en/images/wdir-merge.svg en/images/wdir-pre-branch.svg en/images/wdir.svg |
line diff
1.1 --- a/Makefile Thu Mar 12 15:53:01 2009 +0800 1.2 +++ b/Makefile Thu Mar 12 15:58:38 2009 +0800 1.3 @@ -140,12 +140,12 @@ 1.4 else 1.5 html: build/$(LINGUA)/html/index.html 1.6 1.7 -build/$(LINGUA)/html/index.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html.xsl stylesheets/$(LINGUA)/html.xsl 1.8 +build/$(LINGUA)/html/index.html: build/$(LINGUA)/source/hgbook.xml xsl/html.xsl xsl/$(LINGUA)/html.xsl 1.9 mkdir -p build/$(LINGUA)/html/images 1.10 cp en/images/*.png build/$(LINGUA)/html/images 1.11 - cp stylesheets/hgbook.css build/$(LINGUA)/html 1.12 + cp web/styles.css build/$(LINGUA)/html/hgbook.css 1.13 xsltproc --output build/$(LINGUA)/html/ \ 1.14 - stylesheets/$(LINGUA)/html.xsl build/$(LINGUA)/source/hgbook.xml 1.15 + xsl/$(LINGUA)/html.xsl build/$(LINGUA)/source/hgbook.xml 1.16 endif 1.17 1.18 ifndef LINGUA 1.19 @@ -156,12 +156,12 @@ 1.20 else 1.21 html-single: build/$(LINGUA)/html-single/hgbook.html 1.22 1.23 -build/$(LINGUA)/html-single/hgbook.html: build/$(LINGUA)/source/hgbook.xml stylesheets/html-single.xsl stylesheets/$(LINGUA)/html-single.xsl 1.24 +build/$(LINGUA)/html-single/hgbook.html: build/$(LINGUA)/source/hgbook.xml xsl/html-single.xsl xsl/$(LINGUA)/html-single.xsl 1.25 mkdir -p build/$(LINGUA)/html-single/images 1.26 cp en/images/*.png build/$(LINGUA)/html-single/images 1.27 - cp stylesheets/hgbook.css build/$(LINGUA)/html-single 1.28 + cp web/styles.css build/$(LINGUA)/html-single/hgbook.css 1.29 xsltproc --output build/$(LINGUA)/html-single/hgbook.html \ 1.30 - stylesheets/$(LINGUA)/html-single.xsl build/$(LINGUA)/source/hgbook.xml 1.31 + xsl/$(LINGUA)/html-single.xsl build/$(LINGUA)/source/hgbook.xml 1.32 endif 1.33 1.34 ifndef LINGUA 1.35 @@ -172,7 +172,7 @@ 1.36 else 1.37 pdf: build/$(LINGUA)/pdf/hgbook.pdf 1.38 1.39 -build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl 1.40 +build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml xsl/fo.xsl xsl/$(LINGUA)/fo.xsl 1.41 mkdir -p build/$(LINGUA)/pdf 1.42 java -classpath tools/fop/lib/saxon65.jar:tools/fop/lib/saxon65-dbxsl.jar:tools/fop/lib/xml-commons-resolver-1.2.jar:tools/fop/conf \ 1.43 com.icl.saxon.StyleSheet \ 1.44 @@ -181,7 +181,7 @@ 1.45 -r org.apache.xml.resolver.tools.CatalogResolver \ 1.46 -o build/$(LINGUA)/source/hgbook.fo \ 1.47 build/$(LINGUA)/source/hgbook.xml \ 1.48 - stylesheets/$(LINGUA)/fo.xsl \ 1.49 + xsl/$(LINGUA)/fo.xsl \ 1.50 fop1.extensions=1 1.51 1.52 (cd build/$(LINGUA)/source && ../../../tools/fop/fop.sh hgbook.fo ../pdf/hgbook.pdf)
2.1 --- a/en/figs/feature-branches.dot Thu Mar 12 15:53:01 2009 +0800 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,8 +0,0 @@ 2.4 -digraph feature_branches { 2.5 - master -> crypto; 2.6 - master -> filesystems; 2.7 - master -> ipc; 2.8 - master -> memory; 2.9 - master -> network; 2.10 - master -> security; 2.11 -}
3.1 --- a/en/figs/filelog.svg Thu Mar 12 15:53:01 2009 +0800 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,373 +0,0 @@ 3.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 3.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 3.6 -<svg 3.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 3.8 - xmlns:cc="http://web.resource.org/cc/" 3.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 3.10 - xmlns:svg="http://www.w3.org/2000/svg" 3.11 - xmlns="http://www.w3.org/2000/svg" 3.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 3.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 3.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 3.15 - width="744.09448819" 3.16 - height="1052.3622047" 3.17 - id="svg2" 3.18 - sodipodi:version="0.32" 3.19 - inkscape:version="0.45.1" 3.20 - sodipodi:docname="filelog.svg" 3.21 - sodipodi:docbase="/home/arun/hgbook/en" 3.22 - inkscape:output_extension="org.inkscape.output.svg.inkscape"> 3.23 - <defs 3.24 - id="defs4"> 3.25 - <marker 3.26 - inkscape:stockid="Arrow1Mend" 3.27 - orient="auto" 3.28 - refY="0.0" 3.29 - refX="0.0" 3.30 - id="Arrow1Mend" 3.31 - style="overflow:visible;"> 3.32 - <path 3.33 - id="path3128" 3.34 - 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 " 3.35 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 3.36 - transform="scale(0.4) rotate(180) translate(10,0)" /> 3.37 - </marker> 3.38 - <linearGradient 3.39 - id="linearGradient2887"> 3.40 - <stop 3.41 - style="stop-color:#91cfcf;stop-opacity:1;" 3.42 - offset="0" 3.43 - id="stop2889" /> 3.44 - <stop 3.45 - style="stop-color:aqua;stop-opacity:0;" 3.46 - offset="1" 3.47 - id="stop2891" /> 3.48 - </linearGradient> 3.49 - <linearGradient 3.50 - id="linearGradient2795"> 3.51 - <stop 3.52 - style="stop-color:#ccc;stop-opacity:1;" 3.53 - offset="0" 3.54 - id="stop2797" /> 3.55 - <stop 3.56 - style="stop-color:#ccc;stop-opacity:0;" 3.57 - offset="1" 3.58 - id="stop2799" /> 3.59 - </linearGradient> 3.60 - <linearGradient 3.61 - inkscape:collect="always" 3.62 - xlink:href="#linearGradient2795" 3.63 - id="linearGradient3170" 3.64 - gradientUnits="userSpaceOnUse" 3.65 - gradientTransform="translate(121.2183,94.95434)" 3.66 - x1="81.322357" 3.67 - y1="404.34424" 3.68 - x2="201.52036" 3.69 - y2="373.03967" /> 3.70 - <linearGradient 3.71 - inkscape:collect="always" 3.72 - xlink:href="#linearGradient2887" 3.73 - id="linearGradient3172" 3.74 - gradientUnits="userSpaceOnUse" 3.75 - gradientTransform="translate(0,12)" 3.76 - x1="62.634491" 3.77 - y1="503.3392" 3.78 - x2="248.49242" 3.79 - y2="462.94327" /> 3.80 - <linearGradient 3.81 - inkscape:collect="always" 3.82 - xlink:href="#linearGradient2795" 3.83 - id="linearGradient3174" 3.84 - gradientUnits="userSpaceOnUse" 3.85 - gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 3.86 - x1="81.322357" 3.87 - y1="404.34424" 3.88 - x2="201.52036" 3.89 - y2="373.03967" /> 3.90 - <linearGradient 3.91 - inkscape:collect="always" 3.92 - xlink:href="#linearGradient2887" 3.93 - id="linearGradient3176" 3.94 - gradientUnits="userSpaceOnUse" 3.95 - gradientTransform="translate(0,12)" 3.96 - x1="62.634491" 3.97 - y1="503.3392" 3.98 - x2="248.49242" 3.99 - y2="462.94327" /> 3.100 - <linearGradient 3.101 - inkscape:collect="always" 3.102 - xlink:href="#linearGradient2795" 3.103 - id="linearGradient3208" 3.104 - gradientUnits="userSpaceOnUse" 3.105 - gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 3.106 - x1="81.322357" 3.107 - y1="404.34424" 3.108 - x2="201.52036" 3.109 - y2="373.03967" /> 3.110 - <linearGradient 3.111 - inkscape:collect="always" 3.112 - xlink:href="#linearGradient2887" 3.113 - id="linearGradient3210" 3.114 - gradientUnits="userSpaceOnUse" 3.115 - gradientTransform="translate(0,12)" 3.116 - x1="62.634491" 3.117 - y1="503.3392" 3.118 - x2="248.49242" 3.119 - y2="462.94327" /> 3.120 - <linearGradient 3.121 - inkscape:collect="always" 3.122 - xlink:href="#linearGradient2795" 3.123 - id="linearGradient3212" 3.124 - gradientUnits="userSpaceOnUse" 3.125 - gradientTransform="translate(121.2183,94.95434)" 3.126 - x1="81.322357" 3.127 - y1="404.34424" 3.128 - x2="201.52036" 3.129 - y2="373.03967" /> 3.130 - <linearGradient 3.131 - inkscape:collect="always" 3.132 - xlink:href="#linearGradient2887" 3.133 - id="linearGradient3214" 3.134 - gradientUnits="userSpaceOnUse" 3.135 - gradientTransform="translate(0,12)" 3.136 - x1="62.634491" 3.137 - y1="503.3392" 3.138 - x2="248.49242" 3.139 - y2="462.94327" /> 3.140 - <linearGradient 3.141 - inkscape:collect="always" 3.142 - xlink:href="#linearGradient2795" 3.143 - id="linearGradient3256" 3.144 - gradientUnits="userSpaceOnUse" 3.145 - gradientTransform="matrix(1.2343775,0,0,0.9981848,103.25588,95.681888)" 3.146 - x1="74.301666" 3.147 - y1="431.67441" 3.148 - x2="260.05884" 3.149 - y2="369.95322" /> 3.150 - <linearGradient 3.151 - inkscape:collect="always" 3.152 - xlink:href="#linearGradient2887" 3.153 - id="linearGradient3258" 3.154 - gradientUnits="userSpaceOnUse" 3.155 - gradientTransform="matrix(1.228929,0,0,0.9972824,-62.037003,13.312997)" 3.156 - x1="62.634491" 3.157 - y1="503.3392" 3.158 - x2="248.49242" 3.159 - y2="462.94327" /> 3.160 - <linearGradient 3.161 - inkscape:collect="always" 3.162 - xlink:href="#linearGradient2795" 3.163 - id="linearGradient3260" 3.164 - gradientUnits="userSpaceOnUse" 3.165 - gradientTransform="matrix(1.2300738,0,0,0.6517275,219.97511,153.61527)" 3.166 - x1="74.387527" 3.167 - y1="431.80576" 3.168 - x2="259.97339" 3.169 - y2="369.82224" /> 3.170 - <linearGradient 3.171 - inkscape:collect="always" 3.172 - xlink:href="#linearGradient2887" 3.173 - id="linearGradient3262" 3.174 - gradientUnits="userSpaceOnUse" 3.175 - gradientTransform="matrix(1.2289272,0,0,0.9972824,-62.036756,13.312985)" 3.176 - x1="62.634491" 3.177 - y1="503.3392" 3.178 - x2="248.49242" 3.179 - y2="462.94327" /> 3.180 - </defs> 3.181 - <sodipodi:namedview 3.182 - id="base" 3.183 - pagecolor="#ffffff" 3.184 - bordercolor="#666666" 3.185 - borderopacity="1.0" 3.186 - gridtolerance="10000" 3.187 - guidetolerance="10" 3.188 - objecttolerance="10" 3.189 - inkscape:pageopacity="0.0" 3.190 - inkscape:pageshadow="2" 3.191 - inkscape:zoom="1.4" 3.192 - inkscape:cx="455.8122" 3.193 - inkscape:cy="520" 3.194 - inkscape:document-units="px" 3.195 - inkscape:current-layer="layer1" 3.196 - inkscape:window-width="1680" 3.197 - inkscape:window-height="970" 3.198 - inkscape:window-x="0" 3.199 - inkscape:window-y="54" /> 3.200 - <metadata 3.201 - id="metadata7"> 3.202 - <rdf:RDF> 3.203 - <cc:Work 3.204 - rdf:about=""> 3.205 - <dc:format>image/svg+xml</dc:format> 3.206 - <dc:type 3.207 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 3.208 - </cc:Work> 3.209 - </rdf:RDF> 3.210 - </metadata> 3.211 - <g 3.212 - inkscape:label="Layer 1" 3.213 - inkscape:groupmode="layer" 3.214 - id="layer1"> 3.215 - <rect 3.216 - style="opacity:1;fill:#abadf8;fill-opacity:1;stroke:#595959;stroke-width:0.93760371;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.217 - id="rect3180" 3.218 - width="273.81375" 3.219 - height="199.06245" 3.220 - x="369.1796" 3.221 - y="351.79019" /> 3.222 - <rect 3.223 - style="opacity:1;fill:#a2f69c;fill-opacity:1;stroke:#595959;stroke-width:0.93760341;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.224 - id="rect3178" 3.225 - width="273.81339" 3.226 - height="199.06233" 3.227 - x="72.699799" 3.228 - y="351.78983" /> 3.229 - <g 3.230 - id="g3144" 3.231 - transform="translate(80.467048,0.71578)"> 3.232 - <g 3.233 - id="g2940"> 3.234 - <rect 3.235 - style="fill:url(#linearGradient3260);fill-opacity:1;stroke:#000000;stroke-width:0.89536202;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.236 - id="rect2914" 3.237 - width="227.38896" 3.238 - height="39.500999" 3.239 - x="311.92496" 3.240 - y="395.08627" /> 3.241 - <text 3.242 - xml:space="preserve" 3.243 - 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" 3.244 - x="323.72824" 3.245 - y="416.7626" 3.246 - id="text2918"><tspan 3.247 - sodipodi:role="line" 3.248 - id="tspan2920" 3.249 - x="323.72824" 3.250 - y="416.7626" 3.251 - style="font-family:Courier">.hg/store/data/README.i</tspan></text> 3.252 - </g> 3.253 - <g 3.254 - transform="translate(3.79093e-5,-80.1853)" 3.255 - id="g2945"> 3.256 - <g 3.257 - id="g2955"> 3.258 - <rect 3.259 - y="475.4968" 3.260 - x="15.550935" 3.261 - height="39.500999" 3.262 - width="227.17694" 3.263 - id="rect2947" 3.264 - style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#000000;stroke-width:1.10706258;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 3.265 - <text 3.266 - id="text2949" 3.267 - y="498.35123" 3.268 - x="31.230644" 3.269 - 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" 3.270 - xml:space="preserve"><tspan 3.271 - style="font-family:Courier" 3.272 - y="498.35123" 3.273 - x="31.230644" 3.274 - id="tspan2951" 3.275 - sodipodi:role="line">README</tspan></text> 3.276 - </g> 3.277 - </g> 3.278 - <path 3.279 - inkscape:connector-type="polyline" 3.280 - id="path2960" 3.281 - d="M 242.94685,414.91115 C 242.94685,414.91115 293.61127,415.26754 310.16269,415.38633" 3.282 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.02046943px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.283 - sodipodi:nodetypes="cz" /> 3.284 - </g> 3.285 - <g 3.286 - id="g3156" 3.287 - transform="translate(80.467048,0.71578)"> 3.288 - <g 3.289 - transform="translate(116,0)" 3.290 - id="g2831"> 3.291 - <rect 3.292 - style="fill:url(#linearGradient3256);fill-opacity:1;stroke:#000000;stroke-width:1.11001658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.293 - id="rect1906" 3.294 - width="228.18446" 3.295 - height="60.499123" 3.296 - x="195.52719" 3.297 - y="465.51859" /> 3.298 - <g 3.299 - id="g2803" 3.300 - transform="translate(-0.893671,1.833581)"> 3.301 - <text 3.302 - id="text1884" 3.303 - y="483.92801" 3.304 - x="208.95944" 3.305 - 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" 3.306 - xml:space="preserve"><tspan 3.307 - style="font-family:Courier" 3.308 - y="483.92801" 3.309 - x="208.95944" 3.310 - id="tspan1886" 3.311 - sodipodi:role="line">.hg/store/data/src/hello.c.d</tspan></text> 3.312 - <text 3.313 - id="text1888" 3.314 - y="507.79309" 3.315 - x="208.95944" 3.316 - 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" 3.317 - xml:space="preserve"><tspan 3.318 - style="font-family:Courier" 3.319 - y="507.79309" 3.320 - x="208.95944" 3.321 - id="tspan1890" 3.322 - sodipodi:role="line">.hg/store/data/src/hello.c.i</tspan></text> 3.323 - </g> 3.324 - </g> 3.325 - <g 3.326 - id="g2907"> 3.327 - <rect 3.328 - style="fill:url(#linearGradient3258);fill-opacity:1;stroke:#000000;stroke-width:1.10706329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 3.329 - id="rect2843" 3.330 - width="227.17728" 3.331 - height="39.500999" 3.332 - x="15.550805" 3.333 - y="475.4968" /> 3.334 - <text 3.335 - xml:space="preserve" 3.336 - 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" 3.337 - x="31.230644" 3.338 - y="498.35123" 3.339 - id="text2847"><tspan 3.340 - sodipodi:role="line" 3.341 - id="tspan2849" 3.342 - x="31.230644" 3.343 - y="498.35123" 3.344 - style="font-family:Courier">src/hello.c</tspan></text> 3.345 - </g> 3.346 - <path 3.347 - inkscape:connection-end="#g2831" 3.348 - inkscape:connection-start="#g2907" 3.349 - inkscape:connector-type="polyline" 3.350 - id="path2962" 3.351 - d="M 242.4315,495.88043 C 242.4315,495.88043 292.8861,495.99942 310.04102,496.03909" 3.352 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 3.353 - sodipodi:nodetypes="cs" /> 3.354 - </g> 3.355 - <text 3.356 - xml:space="preserve" 3.357 - 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" 3.358 - x="98.496666" 3.359 - y="373.96353" 3.360 - id="text3216"><tspan 3.361 - sodipodi:role="line" 3.362 - id="tspan3218" 3.363 - x="98.496666" 3.364 - y="373.96353">Working directory</tspan></text> 3.365 - <text 3.366 - xml:space="preserve" 3.367 - 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" 3.368 - x="391.39197" 3.369 - y="373.96353" 3.370 - id="text3228"><tspan 3.371 - sodipodi:role="line" 3.372 - id="tspan3230" 3.373 - x="391.39197" 3.374 - y="373.96353">Repository</tspan></text> 3.375 - </g> 3.376 -</svg>
4.1 Binary file en/figs/kdiff3.png has changed
5.1 --- a/en/figs/metadata.svg Thu Mar 12 15:53:01 2009 +0800 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,328 +0,0 @@ 5.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 5.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 5.6 -<svg 5.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 5.8 - xmlns:cc="http://web.resource.org/cc/" 5.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 5.10 - xmlns:svg="http://www.w3.org/2000/svg" 5.11 - xmlns="http://www.w3.org/2000/svg" 5.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 5.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 5.14 - width="744.09448819" 5.15 - height="1052.3622047" 5.16 - id="svg2" 5.17 - sodipodi:version="0.32" 5.18 - inkscape:version="0.44.1" 5.19 - sodipodi:docname="metadata.svg" 5.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 5.21 - <defs 5.22 - id="defs4"> 5.23 - <marker 5.24 - inkscape:stockid="Arrow1Mend" 5.25 - orient="auto" 5.26 - refY="0.0" 5.27 - refX="0.0" 5.28 - id="Arrow1Mend" 5.29 - style="overflow:visible;"> 5.30 - <path 5.31 - id="path2944" 5.32 - 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 " 5.33 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 5.34 - transform="scale(0.4) rotate(180) translate(10,0)" /> 5.35 - </marker> 5.36 - </defs> 5.37 - <sodipodi:namedview 5.38 - id="base" 5.39 - pagecolor="#ffffff" 5.40 - bordercolor="#666666" 5.41 - borderopacity="1.0" 5.42 - gridtolerance="10000" 5.43 - guidetolerance="10" 5.44 - objecttolerance="10" 5.45 - inkscape:pageopacity="0.0" 5.46 - inkscape:pageshadow="2" 5.47 - inkscape:zoom="1.4" 5.48 - inkscape:cx="232.14286" 5.49 - inkscape:cy="490.68696" 5.50 - inkscape:document-units="px" 5.51 - inkscape:current-layer="layer1" 5.52 - inkscape:window-width="906" 5.53 - inkscape:window-height="620" 5.54 - inkscape:window-x="181" 5.55 - inkscape:window-y="58" /> 5.56 - <metadata 5.57 - id="metadata7"> 5.58 - <rdf:RDF> 5.59 - <cc:Work 5.60 - rdf:about=""> 5.61 - <dc:format>image/svg+xml</dc:format> 5.62 - <dc:type 5.63 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 5.64 - </cc:Work> 5.65 - </rdf:RDF> 5.66 - </metadata> 5.67 - <g 5.68 - inkscape:label="Layer 1" 5.69 - inkscape:groupmode="layer" 5.70 - id="layer1"> 5.71 - <path 5.72 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 5.73 - d="M 326.94646,467.18359 L 326.94646,510.98123" 5.74 - id="path1910" 5.75 - inkscape:connector-type="polyline" 5.76 - inkscape:connection-end="#rect2962" 5.77 - inkscape:connection-start="#rect2764" /> 5.78 - <path 5.79 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 5.80 - d="M 326.94646,531.98123 L 326.94646,591.77887" 5.81 - id="path1912" 5.82 - inkscape:connector-type="polyline" 5.83 - inkscape:connection-start="#rect2962" 5.84 - inkscape:connection-end="#rect3000" /> 5.85 - <path 5.86 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 5.87 - d="M 316.1622,531.98123 L 192.30212,652.57648" 5.88 - id="path1916" 5.89 - inkscape:connector-type="polyline" 5.90 - inkscape:connection-end="#rect3038" 5.91 - inkscape:connection-start="#rect2962" /> 5.92 - <path 5.93 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 5.94 - d="M 254.23217,467.18359 L 254.23216,510.98123" 5.95 - id="path3088" 5.96 - inkscape:connector-type="polyline" 5.97 - inkscape:connection-start="#rect1872" 5.98 - inkscape:connection-end="#rect2960" /> 5.99 - <path 5.100 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 5.101 - d="M 254.23215,531.98123 L 254.23215,591.77887" 5.102 - id="path3090" 5.103 - inkscape:connector-type="polyline" 5.104 - inkscape:connection-start="#rect2960" 5.105 - inkscape:connection-end="#rect2998" /> 5.106 - <path 5.107 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 5.108 - d="M 248.84002,531.98123 L 186.90999,652.57648" 5.109 - id="path3092" 5.110 - inkscape:connector-type="polyline" 5.111 - inkscape:connection-start="#rect2960" 5.112 - inkscape:connection-end="#rect3038" /> 5.113 - <rect 5.114 - style="fill:#7b7df5;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.115 - id="rect1872" 5.116 - width="51.42857" 5.117 - height="20" 5.118 - x="228.51788" 5.119 - y="446.68359" /> 5.120 - <rect 5.121 - style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.122 - id="rect2764" 5.123 - width="51.42857" 5.124 - height="20" 5.125 - x="301.23218" 5.126 - y="446.68359" /> 5.127 - <rect 5.128 - style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.129 - id="rect2766" 5.130 - width="51.42857" 5.131 - height="20" 5.132 - x="155.80359" 5.133 - y="446.68359" /> 5.134 - <rect 5.135 - style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.136 - id="rect2768" 5.137 - width="51.42857" 5.138 - height="20" 5.139 - x="83.089294" 5.140 - y="446.68359" /> 5.141 - <path 5.142 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.143 - d="M 135.01786,456.68359 L 155.30359,456.68359" 5.144 - id="path2770" 5.145 - inkscape:connector-type="polyline" 5.146 - inkscape:connection-start="#rect2768" 5.147 - inkscape:connection-end="#rect2766" /> 5.148 - <path 5.149 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.150 - d="M 207.73216,456.68359 L 228.01788,456.68359" 5.151 - id="path2772" 5.152 - inkscape:connector-type="polyline" 5.153 - inkscape:connection-start="#rect2766" 5.154 - inkscape:connection-end="#rect1872" /> 5.155 - <path 5.156 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.157 - d="M 280.44645,456.68359 L 300.73218,456.68359" 5.158 - id="path2774" 5.159 - inkscape:connector-type="polyline" 5.160 - inkscape:connection-start="#rect1872" 5.161 - inkscape:connection-end="#rect2764" /> 5.162 - <path 5.163 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 5.164 - d="M 62.303571,456.68359 L 82.589294,456.68359" 5.165 - id="path2778" 5.166 - inkscape:connector-type="polyline" 5.167 - inkscape:connection-end="#rect2768" /> 5.168 - <rect 5.169 - style="fill:#84f57b;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.170 - id="rect2960" 5.171 - width="51.42857" 5.172 - height="20" 5.173 - x="228.51787" 5.174 - y="511.48123" /> 5.175 - <rect 5.176 - style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.177 - id="rect2962" 5.178 - width="51.42857" 5.179 - height="20" 5.180 - x="301.23218" 5.181 - y="511.48123" /> 5.182 - <rect 5.183 - style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.184 - id="rect2964" 5.185 - width="51.42857" 5.186 - height="20" 5.187 - x="155.80357" 5.188 - y="511.48123" /> 5.189 - <rect 5.190 - style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.191 - id="rect2966" 5.192 - width="51.42857" 5.193 - height="20" 5.194 - x="83.089287" 5.195 - y="511.48123" /> 5.196 - <path 5.197 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.198 - d="M 135.01786,521.48121 L 155.30359,521.48121" 5.199 - id="path2968" 5.200 - inkscape:connector-type="polyline" /> 5.201 - <path 5.202 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.203 - d="M 207.73216,521.48121 L 228.01788,521.48121" 5.204 - id="path2970" 5.205 - inkscape:connector-type="polyline" /> 5.206 - <path 5.207 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.208 - d="M 280.44645,521.48121 L 300.73218,521.48121" 5.209 - id="path2972" 5.210 - inkscape:connector-type="polyline" /> 5.211 - <path 5.212 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 5.213 - d="M 62.30358,521.48121 L 82.5893,521.48121" 5.214 - id="path2974" 5.215 - inkscape:connector-type="polyline" /> 5.216 - <rect 5.217 - style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.218 - id="rect2998" 5.219 - width="51.42857" 5.220 - height="20" 5.221 - x="228.51787" 5.222 - y="592.27887" /> 5.223 - <rect 5.224 - style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.225 - id="rect3000" 5.226 - width="51.42857" 5.227 - height="20" 5.228 - x="301.23218" 5.229 - y="592.27887" /> 5.230 - <rect 5.231 - style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.232 - id="rect3002" 5.233 - width="51.42857" 5.234 - height="20" 5.235 - x="155.80357" 5.236 - y="592.27887" /> 5.237 - <rect 5.238 - style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.239 - id="rect3004" 5.240 - width="51.42857" 5.241 - height="20" 5.242 - x="83.089287" 5.243 - y="592.27887" /> 5.244 - <path 5.245 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.246 - d="M 135.01786,602.27884 L 155.30359,602.27884" 5.247 - id="path3006" 5.248 - inkscape:connector-type="polyline" /> 5.249 - <path 5.250 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.251 - d="M 207.73216,602.27884 L 228.01788,602.27884" 5.252 - id="path3008" 5.253 - inkscape:connector-type="polyline" /> 5.254 - <path 5.255 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.256 - d="M 280.44645,602.27884 L 300.73218,602.27884" 5.257 - id="path3010" 5.258 - inkscape:connector-type="polyline" /> 5.259 - <path 5.260 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 5.261 - d="M 62.30358,602.27884 L 82.5893,602.27884" 5.262 - id="path3012" 5.263 - inkscape:connector-type="polyline" /> 5.264 - <rect 5.265 - style="fill:#ffced6;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.266 - id="rect3034" 5.267 - width="51.42857" 5.268 - height="20" 5.269 - x="228.51787" 5.270 - y="653.07648" /> 5.271 - <rect 5.272 - style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.273 - id="rect3038" 5.274 - width="51.42857" 5.275 - height="20" 5.276 - x="155.80357" 5.277 - y="653.07648" /> 5.278 - <rect 5.279 - style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 5.280 - id="rect3040" 5.281 - width="51.42857" 5.282 - height="20" 5.283 - x="83.089287" 5.284 - y="653.07648" /> 5.285 - <path 5.286 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.287 - d="M 135.01786,663.07646 L 155.30359,663.07646" 5.288 - id="path3042" 5.289 - inkscape:connector-type="polyline" /> 5.290 - <path 5.291 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 5.292 - d="M 207.73216,663.07646 L 228.01788,663.07646" 5.293 - id="path3044" 5.294 - inkscape:connector-type="polyline" /> 5.295 - <path 5.296 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 5.297 - d="M 62.30358,663.07646 L 82.5893,663.07646" 5.298 - id="path3048" 5.299 - inkscape:connector-type="polyline" /> 5.300 - <text 5.301 - xml:space="preserve" 5.302 - 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" 5.303 - x="82.072548" 5.304 - y="432.64789" 5.305 - id="text3094"><tspan 5.306 - sodipodi:role="line" 5.307 - id="tspan3096" 5.308 - x="82.072548" 5.309 - y="432.64789">Changelog</tspan></text> 5.310 - <text 5.311 - xml:space="preserve" 5.312 - 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" 5.313 - x="82.306923" 5.314 - y="498.97327" 5.315 - id="text3098"><tspan 5.316 - sodipodi:role="line" 5.317 - id="tspan3100" 5.318 - x="82.306923" 5.319 - y="498.97327">Manifest</tspan></text> 5.320 - <text 5.321 - xml:space="preserve" 5.322 - 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" 5.323 - x="82.14286" 5.324 - y="580.08569" 5.325 - id="text3102"><tspan 5.326 - sodipodi:role="line" 5.327 - id="tspan3104" 5.328 - x="82.14286" 5.329 - y="580.08569">Filelogs</tspan></text> 5.330 - </g> 5.331 -</svg>
6.1 --- a/en/figs/mq-stack.svg Thu Mar 12 15:53:01 2009 +0800 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,270 +0,0 @@ 6.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 6.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 6.6 -<svg 6.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 6.8 - xmlns:cc="http://web.resource.org/cc/" 6.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 6.10 - xmlns:svg="http://www.w3.org/2000/svg" 6.11 - xmlns="http://www.w3.org/2000/svg" 6.12 - xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" 6.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 6.14 - width="744.09448819" 6.15 - height="1052.3622047" 6.16 - id="svg2" 6.17 - sodipodi:version="0.32" 6.18 - inkscape:version="0.43" 6.19 - sodipodi:docname="mq-stack.svg" 6.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 6.21 - <defs 6.22 - id="defs4" /> 6.23 - <sodipodi:namedview 6.24 - id="base" 6.25 - pagecolor="#ffffff" 6.26 - bordercolor="#666666" 6.27 - borderopacity="1.0" 6.28 - inkscape:pageopacity="0.0" 6.29 - inkscape:pageshadow="2" 6.30 - inkscape:zoom="1.4142136" 6.31 - inkscape:cx="299.33323" 6.32 - inkscape:cy="815.646" 6.33 - inkscape:document-units="px" 6.34 - inkscape:current-layer="layer1" 6.35 - inkscape:window-width="1014" 6.36 - inkscape:window-height="689" 6.37 - inkscape:window-x="0" 6.38 - inkscape:window-y="25" /> 6.39 - <metadata 6.40 - id="metadata7"> 6.41 - <rdf:RDF> 6.42 - <cc:Work 6.43 - rdf:about=""> 6.44 - <dc:format>image/svg+xml</dc:format> 6.45 - <dc:type 6.46 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 6.47 - </cc:Work> 6.48 - </rdf:RDF> 6.49 - </metadata> 6.50 - <g 6.51 - inkscape:label="Layer 1" 6.52 - inkscape:groupmode="layer" 6.53 - id="layer1"> 6.54 - <rect 6.55 - style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.56 - id="rect1307" 6.57 - width="202.93683" 6.58 - height="24.243662" 6.59 - x="230.01944" 6.60 - y="221.70146" /> 6.61 - <text 6.62 - xml:space="preserve" 6.63 - 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:Bitstream Vera Sans" 6.64 - x="237.89606" 6.65 - y="237.13383" 6.66 - id="text1309"><tspan 6.67 - sodipodi:role="line" 6.68 - id="tspan1311" 6.69 - x="237.89606" 6.70 - y="237.13383">prevent-compiler-reorder.patch</tspan></text> 6.71 - <rect 6.72 - style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.73 - id="rect1320" 6.74 - width="202.93683" 6.75 - height="24.243662" 6.76 - x="230.01936" 6.77 - y="251.34325" /> 6.78 - <text 6.79 - xml:space="preserve" 6.80 - 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:Bitstream Vera Sans" 6.81 - x="237.89598" 6.82 - y="266.77563" 6.83 - id="text1322"><tspan 6.84 - sodipodi:role="line" 6.85 - id="tspan1324" 6.86 - x="237.89598" 6.87 - y="266.77563">namespace-cleanup.patch</tspan></text> 6.88 - <rect 6.89 - style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.90 - id="rect2217" 6.91 - width="202.93683" 6.92 - height="24.243662" 6.93 - x="230.01936" 6.94 - y="280.98505" /> 6.95 - <text 6.96 - xml:space="preserve" 6.97 - 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:Bitstream Vera Sans" 6.98 - x="237.89598" 6.99 - y="296.41742" 6.100 - id="text2219"><tspan 6.101 - sodipodi:role="line" 6.102 - id="tspan2221" 6.103 - x="237.89598" 6.104 - y="296.41742">powerpc-port-fixes.patch</tspan></text> 6.105 - <rect 6.106 - style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.107 - id="rect3114" 6.108 - width="202.93683" 6.109 - height="24.243662" 6.110 - x="230.01936" 6.111 - y="310.6268" /> 6.112 - <text 6.113 - xml:space="preserve" 6.114 - 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:Bitstream Vera Sans" 6.115 - x="237.89598" 6.116 - y="326.05917" 6.117 - id="text3116"><tspan 6.118 - sodipodi:role="line" 6.119 - id="tspan3118" 6.120 - x="237.89598" 6.121 - y="326.05917">report-devinfo-correctly.patch</tspan></text> 6.122 - <text 6.123 - xml:space="preserve" 6.124 - style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.125 - x="200.01021" 6.126 - y="191.68094" 6.127 - id="text3170" 6.128 - sodipodi:linespacing="125%"><tspan 6.129 - sodipodi:role="line" 6.130 - id="tspan3172" 6.131 - x="200.01021" 6.132 - y="191.68094" 6.133 - style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 6.134 - <text 6.135 - xml:space="preserve" 6.136 - style="font-size:15.25329685px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.137 - x="255.26627" 6.138 - y="248.79449" 6.139 - id="text3190" 6.140 - sodipodi:linespacing="125%" 6.141 - transform="scale(0.786716,1.271107)"><tspan 6.142 - sodipodi:role="line" 6.143 - id="tspan3192" 6.144 - x="255.26627" 6.145 - y="248.79449" 6.146 - style="font-size:61.01318741px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 6.147 - <text 6.148 - xml:space="preserve" 6.149 - style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.150 - x="195.86807" 6.151 - y="173.17117" 6.152 - id="text4085" 6.153 - sodipodi:linespacing="125%"><tspan 6.154 - sodipodi:role="line" 6.155 - id="tspan4087" 6.156 - x="195.86807" 6.157 - y="173.17117" 6.158 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">present in series,</tspan><tspan 6.159 - sodipodi:role="line" 6.160 - x="195.86807" 6.161 - y="188.17117" 6.162 - id="tspan4089" 6.163 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">but not applied</tspan></text> 6.164 - <text 6.165 - xml:space="preserve" 6.166 - style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.167 - x="195.0712" 6.168 - y="288.91745" 6.169 - id="text4091" 6.170 - sodipodi:linespacing="125%"><tspan 6.171 - sodipodi:role="line" 6.172 - id="tspan4093" 6.173 - x="195.0712" 6.174 - y="288.91745" 6.175 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">patches applied,</tspan><tspan 6.176 - sodipodi:role="line" 6.177 - x="195.0712" 6.178 - y="303.91745" 6.179 - id="tspan4111" 6.180 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">changesets present</tspan></text> 6.181 - <text 6.182 - xml:space="preserve" 6.183 - style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.184 - x="195.0712" 6.185 - y="229.28813" 6.186 - id="text4095" 6.187 - sodipodi:linespacing="125%"><tspan 6.188 - sodipodi:role="line" 6.189 - id="tspan4097" 6.190 - x="195.0712" 6.191 - y="229.28813" 6.192 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">topmost</tspan><tspan 6.193 - sodipodi:role="line" 6.194 - x="195.0712" 6.195 - y="244.28813" 6.196 - id="tspan4109" 6.197 - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">applied patch</tspan></text> 6.198 - <text 6.199 - xml:space="preserve" 6.200 - style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.201 - x="450.4975" 6.202 - y="238.29692" 6.203 - id="text4137"><tspan 6.204 - sodipodi:role="line" 6.205 - id="tspan4139" 6.206 - x="450.4975" 6.207 - y="238.29692">201ad3209902</tspan></text> 6.208 - <text 6.209 - xml:space="preserve" 6.210 - style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.211 - x="450.05804" 6.212 - y="267.93872" 6.213 - id="text4141"><tspan 6.214 - sodipodi:role="line" 6.215 - id="tspan4143" 6.216 - x="450.05804" 6.217 - y="267.93872">126b84e593ae</tspan></text> 6.218 - <text 6.219 - xml:space="preserve" 6.220 - style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.221 - x="450.6557" 6.222 - y="297.58051" 6.223 - id="text4145"><tspan 6.224 - sodipodi:role="line" 6.225 - id="tspan4147" 6.226 - x="450.6557" 6.227 - y="297.58051">a655daf15409</tspan></text> 6.228 - <text 6.229 - xml:space="preserve" 6.230 - style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.231 - x="450.71429" 6.232 - y="327.22226" 6.233 - id="text4149"><tspan 6.234 - sodipodi:role="line" 6.235 - id="tspan4151" 6.236 - x="450.71429" 6.237 - y="327.22226">e50d59aaea3a</tspan></text> 6.238 - <rect 6.239 - style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.240 - id="rect3106" 6.241 - width="202.93683" 6.242 - height="24.243662" 6.243 - x="230.01936" 6.244 - y="150.41792" /> 6.245 - <text 6.246 - xml:space="preserve" 6.247 - style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.248 - x="237.89598" 6.249 - y="165.8503" 6.250 - id="text3108"><tspan 6.251 - sodipodi:role="line" 6.252 - id="tspan3110" 6.253 - x="237.89598" 6.254 - y="165.8503">forbid-illegal-params.patch</tspan></text> 6.255 - <rect 6.256 - style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 6.257 - id="rect2241" 6.258 - width="202.93683" 6.259 - height="24.243662" 6.260 - x="230.16466" 6.261 - y="180.05968" /> 6.262 - <text 6.263 - xml:space="preserve" 6.264 - style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 6.265 - x="238.04128" 6.266 - y="195.49205" 6.267 - id="text2243"><tspan 6.268 - sodipodi:role="line" 6.269 - id="tspan2245" 6.270 - x="238.04128" 6.271 - y="195.49205">fix-memory-leak.patch</tspan></text> 6.272 - </g> 6.273 -</svg>
7.1 Binary file en/figs/note.png has changed
8.1 --- a/en/figs/revlog.svg Thu Mar 12 15:53:01 2009 +0800 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,1155 +0,0 @@ 8.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 8.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 8.6 -<svg 8.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 8.8 - xmlns:cc="http://web.resource.org/cc/" 8.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 8.10 - xmlns:svg="http://www.w3.org/2000/svg" 8.11 - xmlns="http://www.w3.org/2000/svg" 8.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 8.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 8.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 8.15 - width="744.09448819" 8.16 - height="1052.3622047" 8.17 - id="svg2" 8.18 - sodipodi:version="0.32" 8.19 - inkscape:version="0.44.1" 8.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 8.21 - sodipodi:docname="revlog.svg"> 8.22 - <defs 8.23 - id="defs4"> 8.24 - <marker 8.25 - inkscape:stockid="Arrow1Mend" 8.26 - orient="auto" 8.27 - refY="0.0" 8.28 - refX="0.0" 8.29 - id="Arrow1Mend" 8.30 - style="overflow:visible;"> 8.31 - <path 8.32 - id="path4852" 8.33 - 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 " 8.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 8.35 - transform="scale(0.4) rotate(180) translate(10,0)" /> 8.36 - </marker> 8.37 - <linearGradient 8.38 - id="linearGradient3092"> 8.39 - <stop 8.40 - style="stop-color:#44436f;stop-opacity:1;" 8.41 - offset="0" 8.42 - id="stop3094" /> 8.43 - <stop 8.44 - style="stop-color:#abade5;stop-opacity:1;" 8.45 - offset="1" 8.46 - id="stop3096" /> 8.47 - </linearGradient> 8.48 - <linearGradient 8.49 - inkscape:collect="always" 8.50 - xlink:href="#linearGradient3092" 8.51 - id="linearGradient3118" 8.52 - gradientUnits="userSpaceOnUse" 8.53 - x1="176.16635" 8.54 - y1="405.21934" 8.55 - x2="417.11935" 8.56 - y2="405.21934" /> 8.57 - <linearGradient 8.58 - inkscape:collect="always" 8.59 - xlink:href="#linearGradient3092" 8.60 - id="linearGradient3120" 8.61 - gradientUnits="userSpaceOnUse" 8.62 - x1="176.16635" 8.63 - y1="405.21934" 8.64 - x2="417.11935" 8.65 - y2="405.21934" /> 8.66 - <linearGradient 8.67 - inkscape:collect="always" 8.68 - xlink:href="#linearGradient3092" 8.69 - id="linearGradient3129" 8.70 - gradientUnits="userSpaceOnUse" 8.71 - x1="176.16635" 8.72 - y1="405.21934" 8.73 - x2="417.11935" 8.74 - y2="405.21934" 8.75 - gradientTransform="translate(-0.928574,-1.428574)" /> 8.76 - <linearGradient 8.77 - inkscape:collect="always" 8.78 - xlink:href="#linearGradient3092" 8.79 - id="linearGradient3133" 8.80 - gradientUnits="userSpaceOnUse" 8.81 - x1="176.16635" 8.82 - y1="405.21934" 8.83 - x2="417.11935" 8.84 - y2="405.21934" 8.85 - gradientTransform="translate(-0.928574,-1.428574)" /> 8.86 - <linearGradient 8.87 - inkscape:collect="always" 8.88 - xlink:href="#linearGradient3092" 8.89 - id="linearGradient3708" 8.90 - gradientUnits="userSpaceOnUse" 8.91 - gradientTransform="matrix(0.423343,0,0,0.423343,138.874,-67.01732)" 8.92 - x1="175.23776" 8.93 - y1="509.98154" 8.94 - x2="416.29077" 8.95 - y2="297.49997" /> 8.96 - <linearGradient 8.97 - inkscape:collect="always" 8.98 - xlink:href="#linearGradient3092" 8.99 - id="linearGradient5164" 8.100 - gradientUnits="userSpaceOnUse" 8.101 - gradientTransform="matrix(0.423343,0,0,0.423343,198.249,247.4358)" 8.102 - x1="175.23776" 8.103 - y1="509.98154" 8.104 - x2="416.29077" 8.105 - y2="297.49997" /> 8.106 - <linearGradient 8.107 - inkscape:collect="always" 8.108 - xlink:href="#linearGradient3092" 8.109 - id="linearGradient5584" 8.110 - gradientUnits="userSpaceOnUse" 8.111 - gradientTransform="matrix(0.423343,0,0,0.423343,143.9081,371.2915)" 8.112 - x1="175.23776" 8.113 - y1="509.98154" 8.114 - x2="416.29077" 8.115 - y2="297.49997" /> 8.116 - <linearGradient 8.117 - inkscape:collect="always" 8.118 - xlink:href="#linearGradient3092" 8.119 - id="linearGradient5784" 8.120 - gradientUnits="userSpaceOnUse" 8.121 - gradientTransform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 8.122 - x1="175.23776" 8.123 - y1="509.98154" 8.124 - x2="416.29077" 8.125 - y2="297.49997" /> 8.126 - <linearGradient 8.127 - inkscape:collect="always" 8.128 - xlink:href="#linearGradient3092" 8.129 - id="linearGradient5786" 8.130 - gradientUnits="userSpaceOnUse" 8.131 - gradientTransform="matrix(0.423343,0,0,0.423343,198.249,152.137)" 8.132 - x1="175.23776" 8.133 - y1="509.98154" 8.134 - x2="416.29077" 8.135 - y2="297.49997" /> 8.136 - <linearGradient 8.137 - inkscape:collect="always" 8.138 - xlink:href="#linearGradient3092" 8.139 - id="linearGradient5895" 8.140 - gradientUnits="userSpaceOnUse" 8.141 - gradientTransform="matrix(0.423343,0,0,0.423343,198.0215,261.7142)" 8.142 - x1="175.23776" 8.143 - y1="509.98154" 8.144 - x2="416.29077" 8.145 - y2="297.49997" /> 8.146 - <linearGradient 8.147 - inkscape:collect="always" 8.148 - xlink:href="#linearGradient3092" 8.149 - id="linearGradient5958" 8.150 - gradientUnits="userSpaceOnUse" 8.151 - gradientTransform="matrix(0.423343,0,0,0.423343,137.1978,42.55987)" 8.152 - x1="175.23776" 8.153 - y1="509.98154" 8.154 - x2="416.29077" 8.155 - y2="297.49997" /> 8.156 - </defs> 8.157 - <sodipodi:namedview 8.158 - id="base" 8.159 - pagecolor="#ffffff" 8.160 - bordercolor="#666666" 8.161 - borderopacity="1.0" 8.162 - gridtolerance="10000" 8.163 - guidetolerance="10" 8.164 - objecttolerance="10" 8.165 - inkscape:pageopacity="0.0" 8.166 - inkscape:pageshadow="2" 8.167 - inkscape:zoom="0.64" 8.168 - inkscape:cx="566.02368" 8.169 - inkscape:cy="688.16826" 8.170 - inkscape:document-units="px" 8.171 - inkscape:current-layer="layer1" 8.172 - inkscape:window-width="906" 8.173 - inkscape:window-height="620" 8.174 - inkscape:window-x="29" 8.175 - inkscape:window-y="79" 8.176 - inkscape:connector-spacing="11" /> 8.177 - <metadata 8.178 - id="metadata7"> 8.179 - <rdf:RDF> 8.180 - <cc:Work 8.181 - rdf:about=""> 8.182 - <dc:format>image/svg+xml</dc:format> 8.183 - <dc:type 8.184 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 8.185 - </cc:Work> 8.186 - </rdf:RDF> 8.187 - </metadata> 8.188 - <g 8.189 - inkscape:label="Layer 1" 8.190 - inkscape:groupmode="layer" 8.191 - id="layer1"> 8.192 - <rect 8.193 - y="168.74846" 8.194 - x="211.58516" 8.195 - height="89.506805" 8.196 - width="101.60232" 8.197 - id="rect3068" 8.198 - style="fill:url(#linearGradient5958);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.199 - <g 8.200 - id="g3215" 8.201 - transform="matrix(0.423343,0,0,0.423343,137.1977,42.55985)"> 8.202 - <rect 8.203 - y="447.71451" 8.204 - x="299.67859" 8.205 - height="48.571426" 8.206 - width="103.14286" 8.207 - id="rect2899" 8.208 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.209 - <text 8.210 - id="text2903" 8.211 - y="464.8139" 8.212 - x="308.89639" 8.213 - 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" 8.214 - xml:space="preserve"><tspan 8.215 - y="464.8139" 8.216 - x="308.89639" 8.217 - sodipodi:role="line" 8.218 - id="tspan2905">Second parent</tspan></text> 8.219 - <text 8.220 - id="text2907" 8.221 - y="485.50256" 8.222 - x="308.20175" 8.223 - 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" 8.224 - xml:space="preserve"><tspan 8.225 - style="font-family:Courier" 8.226 - y="485.50256" 8.227 - x="308.20175" 8.228 - id="tspan2909" 8.229 - sodipodi:role="line">32bf9a5f22c0</tspan></text> 8.230 - </g> 8.231 - <g 8.232 - id="g3250" 8.233 - transform="matrix(0.423343,0,0,0.423343,137.1977,42.55986)"> 8.234 - <rect 8.235 - y="311.28598" 8.236 - x="188.6071" 8.237 - height="48.571426" 8.238 - width="103.14286" 8.239 - id="rect2936" 8.240 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.241 - <text 8.242 - id="text2940" 8.243 - y="328.38538" 8.244 - x="197.82495" 8.245 - 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" 8.246 - xml:space="preserve"><tspan 8.247 - y="328.38538" 8.248 - x="197.82495" 8.249 - sodipodi:role="line" 8.250 - id="tspan2942">Revision hash</tspan></text> 8.251 - <text 8.252 - id="text2944" 8.253 - y="349.07404" 8.254 - x="197.13031" 8.255 - 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" 8.256 - xml:space="preserve"><tspan 8.257 - style="font-family:Courier" 8.258 - y="349.07404" 8.259 - x="197.13031" 8.260 - id="tspan2946" 8.261 - sodipodi:role="line">34b8b7a15ea1</tspan></text> 8.262 - </g> 8.263 - <g 8.264 - id="g3243" 8.265 - transform="matrix(0.423343,0,0,0.423343,137.6664,43.91853)"> 8.266 - <rect 8.267 - y="363.07654" 8.268 - x="187.5" 8.269 - height="75" 8.270 - width="213.85715" 8.271 - id="rect2950" 8.272 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.273 - <text 8.274 - id="text2958" 8.275 - y="400.86459" 8.276 - x="196.02321" 8.277 - 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" 8.278 - xml:space="preserve"><tspan 8.279 - style="fill:black;fill-opacity:1;font-family:Courier" 8.280 - y="400.86459" 8.281 - x="196.02321" 8.282 - id="tspan2960" 8.283 - sodipodi:role="line">...</tspan></text> 8.284 - <text 8.285 - id="text2954" 8.286 - y="380.17593" 8.287 - x="196.71785" 8.288 - 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" 8.289 - xml:space="preserve"><tspan 8.290 - y="380.17593" 8.291 - x="196.71785" 8.292 - sodipodi:role="line" 8.293 - id="tspan2956" 8.294 - style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 8.295 - </g> 8.296 - <g 8.297 - id="g5529" 8.298 - transform="translate(-6.710312,-8.165836e-6)"> 8.299 - <rect 8.300 - style="fill:url(#linearGradient5584);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.301 - id="rect3509" 8.302 - width="101.60232" 8.303 - height="89.506805" 8.304 - x="218.29547" 8.305 - y="497.4801" /> 8.306 - <g 8.307 - transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 8.308 - id="g3513"> 8.309 - <g 8.310 - id="g3515"> 8.311 - <rect 8.312 - y="447.72418" 8.313 - x="188.6071" 8.314 - height="48.571426" 8.315 - width="103.14286" 8.316 - id="rect3517" 8.317 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.318 - <text 8.319 - id="text3519" 8.320 - y="464.82358" 8.321 - x="197.82495" 8.322 - 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" 8.323 - xml:space="preserve"><tspan 8.324 - y="464.82358" 8.325 - x="197.82495" 8.326 - sodipodi:role="line" 8.327 - id="tspan3521">First parent</tspan></text> 8.328 - <text 8.329 - id="text3523" 8.330 - y="485.51224" 8.331 - x="197.13031" 8.332 - 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" 8.333 - xml:space="preserve"><tspan 8.334 - style="font-family:Courier" 8.335 - y="485.51224" 8.336 - x="197.13031" 8.337 - id="tspan3525" 8.338 - sodipodi:role="line">000000000000</tspan></text> 8.339 - </g> 8.340 - <g 8.341 - id="g3527"> 8.342 - <rect 8.343 - y="447.71451" 8.344 - x="299.67859" 8.345 - height="48.571426" 8.346 - width="103.14286" 8.347 - id="rect3529" 8.348 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.349 - <text 8.350 - id="text3531" 8.351 - y="464.8139" 8.352 - x="308.89639" 8.353 - 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" 8.354 - xml:space="preserve"><tspan 8.355 - y="464.8139" 8.356 - x="308.89639" 8.357 - sodipodi:role="line" 8.358 - id="tspan3533">Second parent</tspan></text> 8.359 - <text 8.360 - id="text3535" 8.361 - y="485.50256" 8.362 - x="308.20175" 8.363 - 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" 8.364 - xml:space="preserve"><tspan 8.365 - style="font-family:Courier" 8.366 - y="485.50256" 8.367 - x="308.20175" 8.368 - id="tspan3537" 8.369 - sodipodi:role="line">000000000000</tspan></text> 8.370 - </g> 8.371 - </g> 8.372 - <g 8.373 - transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 8.374 - id="g3539"> 8.375 - <rect 8.376 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.377 - id="rect3541" 8.378 - width="103.14286" 8.379 - height="48.571426" 8.380 - x="188.6071" 8.381 - y="311.28598" /> 8.382 - <text 8.383 - xml:space="preserve" 8.384 - 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" 8.385 - x="197.82495" 8.386 - y="328.38538" 8.387 - id="text3543"><tspan 8.388 - id="tspan3545" 8.389 - sodipodi:role="line" 8.390 - x="197.82495" 8.391 - y="328.38538">Revision hash</tspan></text> 8.392 - <text 8.393 - xml:space="preserve" 8.394 - 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" 8.395 - x="197.13031" 8.396 - y="349.07404" 8.397 - id="text3547"><tspan 8.398 - sodipodi:role="line" 8.399 - id="tspan3549" 8.400 - x="197.13031" 8.401 - y="349.07404" 8.402 - style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 8.403 - </g> 8.404 - <g 8.405 - transform="matrix(0.423343,0,0,0.423343,144.3767,372.6502)" 8.406 - id="g3551"> 8.407 - <rect 8.408 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.409 - id="rect3553" 8.410 - width="213.85715" 8.411 - height="75" 8.412 - x="187.5" 8.413 - y="363.07654" /> 8.414 - <text 8.415 - xml:space="preserve" 8.416 - 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" 8.417 - x="196.02321" 8.418 - y="400.86459" 8.419 - id="text3555"><tspan 8.420 - sodipodi:role="line" 8.421 - id="tspan3557" 8.422 - x="196.02321" 8.423 - y="400.86459" 8.424 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 8.425 - <text 8.426 - xml:space="preserve" 8.427 - 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" 8.428 - x="196.71785" 8.429 - y="380.17593" 8.430 - id="text3559"><tspan 8.431 - style="fill:black;fill-opacity:1" 8.432 - id="tspan3561" 8.433 - sodipodi:role="line" 8.434 - x="196.71785" 8.435 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 8.436 - </g> 8.437 - </g> 8.438 - <g 8.439 - id="g4868" 8.440 - transform="translate(-1.676208,-2.342463e-5)"> 8.441 - <rect 8.442 - style="fill:url(#linearGradient3708);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.443 - id="rect3567" 8.444 - width="101.60232" 8.445 - height="89.506805" 8.446 - x="213.26137" 8.447 - y="59.171272" /> 8.448 - <g 8.449 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 8.450 - id="g3573"> 8.451 - <rect 8.452 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.453 - id="rect3575" 8.454 - width="103.14286" 8.455 - height="48.571426" 8.456 - x="188.6071" 8.457 - y="447.72418" /> 8.458 - <text 8.459 - xml:space="preserve" 8.460 - 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" 8.461 - x="197.82495" 8.462 - y="464.82358" 8.463 - id="text3577"><tspan 8.464 - id="tspan3579" 8.465 - sodipodi:role="line" 8.466 - x="197.82495" 8.467 - y="464.82358">First parent</tspan></text> 8.468 - <text 8.469 - xml:space="preserve" 8.470 - 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" 8.471 - x="197.13031" 8.472 - y="485.51224" 8.473 - id="text3581"><tspan 8.474 - sodipodi:role="line" 8.475 - id="tspan3583" 8.476 - x="197.13031" 8.477 - y="485.51224" 8.478 - style="font-family:Courier">34b8b7a15ea1</tspan></text> 8.479 - </g> 8.480 - <g 8.481 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 8.482 - id="g3585"> 8.483 - <rect 8.484 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.485 - id="rect3587" 8.486 - width="103.14286" 8.487 - height="48.571426" 8.488 - x="299.67859" 8.489 - y="447.71451" /> 8.490 - <text 8.491 - xml:space="preserve" 8.492 - 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" 8.493 - x="308.89639" 8.494 - y="464.8139" 8.495 - id="text3589"><tspan 8.496 - id="tspan3591" 8.497 - sodipodi:role="line" 8.498 - x="308.89639" 8.499 - y="464.8139">Second parent</tspan></text> 8.500 - <text 8.501 - xml:space="preserve" 8.502 - 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" 8.503 - x="308.20175" 8.504 - y="485.50256" 8.505 - id="text3593"><tspan 8.506 - sodipodi:role="line" 8.507 - id="tspan3595" 8.508 - x="308.20175" 8.509 - y="485.50256" 8.510 - style="font-family:Courier">000000000000</tspan></text> 8.511 - </g> 8.512 - <g 8.513 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01733)" 8.514 - id="g3597"> 8.515 - <rect 8.516 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.517 - id="rect3599" 8.518 - width="103.14286" 8.519 - height="48.571426" 8.520 - x="188.6071" 8.521 - y="311.28598" /> 8.522 - <text 8.523 - xml:space="preserve" 8.524 - 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" 8.525 - x="197.82495" 8.526 - y="328.38538" 8.527 - id="text3601"><tspan 8.528 - id="tspan3603" 8.529 - sodipodi:role="line" 8.530 - x="197.82495" 8.531 - y="328.38538">Revision hash</tspan></text> 8.532 - <text 8.533 - xml:space="preserve" 8.534 - 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" 8.535 - x="197.13031" 8.536 - y="349.07404" 8.537 - id="text3605"><tspan 8.538 - sodipodi:role="line" 8.539 - id="tspan3607" 8.540 - x="197.13031" 8.541 - y="349.07404" 8.542 - style="font-family:Courier">1b67dc96f27a</tspan></text> 8.543 - </g> 8.544 - <g 8.545 - transform="matrix(0.423343,0,0,0.423343,139.3426,-65.65866)" 8.546 - id="g3609"> 8.547 - <rect 8.548 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.549 - id="rect3611" 8.550 - width="213.85715" 8.551 - height="75" 8.552 - x="187.5" 8.553 - y="363.07654" /> 8.554 - <text 8.555 - xml:space="preserve" 8.556 - 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" 8.557 - x="196.02321" 8.558 - y="400.86459" 8.559 - id="text3613"><tspan 8.560 - sodipodi:role="line" 8.561 - id="tspan3615" 8.562 - x="196.02321" 8.563 - y="400.86459" 8.564 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 8.565 - <text 8.566 - xml:space="preserve" 8.567 - 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" 8.568 - x="196.71785" 8.569 - y="380.17593" 8.570 - id="text3617"><tspan 8.571 - style="fill:black;fill-opacity:1" 8.572 - id="tspan3619" 8.573 - sodipodi:role="line" 8.574 - x="196.71785" 8.575 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 8.576 - </g> 8.577 - </g> 8.578 - <path 8.579 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow1Mend)" 8.580 - d="M 240.78255,143.08593 L 241.42595,171.75349" 8.581 - id="path3801" 8.582 - inkscape:connector-type="polyline" 8.583 - inkscape:connection-start="#g3573" 8.584 - inkscape:connection-end="#g3250" /> 8.585 - <g 8.586 - id="g5677"> 8.587 - <rect 8.588 - style="fill:url(#linearGradient5784);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.589 - id="rect3393" 8.590 - width="101.60232" 8.591 - height="89.506805" 8.592 - x="150.76137" 8.593 - y="278.32565" /> 8.594 - <g 8.595 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 8.596 - id="g3399"> 8.597 - <rect 8.598 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.599 - id="rect3401" 8.600 - width="103.14286" 8.601 - height="48.571426" 8.602 - x="188.6071" 8.603 - y="447.72418" /> 8.604 - <text 8.605 - xml:space="preserve" 8.606 - 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" 8.607 - x="197.82495" 8.608 - y="464.82358" 8.609 - id="text3403"><tspan 8.610 - id="tspan3405" 8.611 - sodipodi:role="line" 8.612 - x="197.82495" 8.613 - y="464.82358">First parent</tspan></text> 8.614 - <text 8.615 - xml:space="preserve" 8.616 - 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" 8.617 - x="197.13031" 8.618 - y="485.51224" 8.619 - id="text3407"><tspan 8.620 - sodipodi:role="line" 8.621 - id="tspan3409" 8.622 - x="197.13031" 8.623 - y="485.51224" 8.624 - style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 8.625 - </g> 8.626 - <g 8.627 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 8.628 - id="g3411"> 8.629 - <rect 8.630 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.631 - id="rect3413" 8.632 - width="103.14286" 8.633 - height="48.571426" 8.634 - x="299.67859" 8.635 - y="447.71451" /> 8.636 - <text 8.637 - xml:space="preserve" 8.638 - 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" 8.639 - x="308.89639" 8.640 - y="464.8139" 8.641 - id="text3415"><tspan 8.642 - id="tspan3417" 8.643 - sodipodi:role="line" 8.644 - x="308.89639" 8.645 - y="464.8139">Second parent</tspan></text> 8.646 - <text 8.647 - xml:space="preserve" 8.648 - 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" 8.649 - x="308.20175" 8.650 - y="485.50256" 8.651 - id="text3419"><tspan 8.652 - sodipodi:role="line" 8.653 - id="tspan3421" 8.654 - x="308.20175" 8.655 - y="485.50256" 8.656 - style="font-family:Courier">000000000000</tspan></text> 8.657 - </g> 8.658 - <g 8.659 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 8.660 - id="g3423"> 8.661 - <rect 8.662 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.663 - id="rect3425" 8.664 - width="103.14286" 8.665 - height="48.571426" 8.666 - x="188.6071" 8.667 - y="311.28598" /> 8.668 - <text 8.669 - xml:space="preserve" 8.670 - 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" 8.671 - x="197.82495" 8.672 - y="328.38538" 8.673 - id="text3427"><tspan 8.674 - id="tspan3429" 8.675 - sodipodi:role="line" 8.676 - x="197.82495" 8.677 - y="328.38538">Revision hash</tspan></text> 8.678 - <text 8.679 - xml:space="preserve" 8.680 - 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" 8.681 - x="197.13031" 8.682 - y="349.07404" 8.683 - id="text3431"><tspan 8.684 - sodipodi:role="line" 8.685 - id="tspan3433" 8.686 - x="197.13031" 8.687 - y="349.07404" 8.688 - style="font-family:Courier">5b80c922ebdd</tspan></text> 8.689 - </g> 8.690 - <g 8.691 - transform="matrix(0.423343,0,0,0.423343,76.84265,153.4957)" 8.692 - id="g3435"> 8.693 - <rect 8.694 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.695 - id="rect3437" 8.696 - width="213.85715" 8.697 - height="75" 8.698 - x="187.5" 8.699 - y="363.07654" /> 8.700 - <text 8.701 - xml:space="preserve" 8.702 - 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" 8.703 - x="196.02321" 8.704 - y="400.86459" 8.705 - id="text3439"><tspan 8.706 - sodipodi:role="line" 8.707 - id="tspan3441" 8.708 - x="196.02321" 8.709 - y="400.86459" 8.710 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 8.711 - <text 8.712 - xml:space="preserve" 8.713 - 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" 8.714 - x="196.71785" 8.715 - y="380.17593" 8.716 - id="text3443"><tspan 8.717 - style="fill:black;fill-opacity:1" 8.718 - id="tspan3445" 8.719 - sodipodi:role="line" 8.720 - x="196.71785" 8.721 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 8.722 - </g> 8.723 - </g> 8.724 - <g 8.725 - id="g5646" 8.726 - transform="translate(-0.227432,0)"> 8.727 - <rect 8.728 - style="fill:url(#linearGradient5786);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.729 - id="rect3451" 8.730 - width="101.60232" 8.731 - height="89.506805" 8.732 - x="272.63638" 8.733 - y="278.32565" /> 8.734 - <g 8.735 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 8.736 - id="g3457"> 8.737 - <rect 8.738 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.739 - id="rect3459" 8.740 - width="103.14286" 8.741 - height="48.571426" 8.742 - x="188.6071" 8.743 - y="447.72418" /> 8.744 - <text 8.745 - xml:space="preserve" 8.746 - 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" 8.747 - x="197.82495" 8.748 - y="464.82358" 8.749 - id="text3461"><tspan 8.750 - id="tspan3463" 8.751 - sodipodi:role="line" 8.752 - x="197.82495" 8.753 - y="464.82358">First parent</tspan></text> 8.754 - <text 8.755 - xml:space="preserve" 8.756 - 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" 8.757 - x="197.13031" 8.758 - y="485.51224" 8.759 - id="text3465"><tspan 8.760 - sodipodi:role="line" 8.761 - id="tspan3467" 8.762 - x="197.13031" 8.763 - y="485.51224" 8.764 - style="font-family:Courier">ecacb6b4c9fd</tspan></text> 8.765 - </g> 8.766 - <g 8.767 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 8.768 - id="g3469"> 8.769 - <rect 8.770 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.771 - id="rect3471" 8.772 - width="103.14286" 8.773 - height="48.571426" 8.774 - x="299.67859" 8.775 - y="447.71451" /> 8.776 - <text 8.777 - xml:space="preserve" 8.778 - 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" 8.779 - x="308.89639" 8.780 - y="464.8139" 8.781 - id="text3473"><tspan 8.782 - id="tspan3475" 8.783 - sodipodi:role="line" 8.784 - x="308.89639" 8.785 - y="464.8139">Second parent</tspan></text> 8.786 - <text 8.787 - xml:space="preserve" 8.788 - 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" 8.789 - x="308.20175" 8.790 - y="485.50256" 8.791 - id="text3477"><tspan 8.792 - sodipodi:role="line" 8.793 - id="tspan3479" 8.794 - x="308.20175" 8.795 - y="485.50256" 8.796 - style="font-family:Courier">000000000000</tspan></text> 8.797 - </g> 8.798 - <g 8.799 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 8.800 - id="g3481"> 8.801 - <rect 8.802 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.803 - id="rect3483" 8.804 - width="103.14286" 8.805 - height="48.571426" 8.806 - x="188.6071" 8.807 - y="311.28598" /> 8.808 - <text 8.809 - xml:space="preserve" 8.810 - 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" 8.811 - x="197.82495" 8.812 - y="328.38538" 8.813 - id="text3485"><tspan 8.814 - id="tspan3487" 8.815 - sodipodi:role="line" 8.816 - x="197.82495" 8.817 - y="328.38538">Revision hash</tspan></text> 8.818 - <text 8.819 - xml:space="preserve" 8.820 - 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" 8.821 - x="197.13031" 8.822 - y="349.07404" 8.823 - id="text3489"><tspan 8.824 - sodipodi:role="line" 8.825 - id="tspan3491" 8.826 - x="197.13031" 8.827 - y="349.07404" 8.828 - style="font-family:Courier">32bf9a5f22c0</tspan></text> 8.829 - </g> 8.830 - <g 8.831 - transform="matrix(0.423343,0,0,0.423343,198.7176,153.4957)" 8.832 - id="g3493"> 8.833 - <rect 8.834 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.835 - id="rect3495" 8.836 - width="213.85715" 8.837 - height="75" 8.838 - x="187.5" 8.839 - y="363.07654" /> 8.840 - <text 8.841 - xml:space="preserve" 8.842 - 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" 8.843 - x="196.02321" 8.844 - y="400.86459" 8.845 - id="text3497"><tspan 8.846 - sodipodi:role="line" 8.847 - id="tspan3499" 8.848 - x="196.02321" 8.849 - y="400.86459" 8.850 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 8.851 - <text 8.852 - xml:space="preserve" 8.853 - 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" 8.854 - x="196.71785" 8.855 - y="380.17593" 8.856 - id="text3501"><tspan 8.857 - style="fill:black;fill-opacity:1" 8.858 - id="tspan3503" 8.859 - sodipodi:role="line" 8.860 - x="196.71785" 8.861 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 8.862 - </g> 8.863 - </g> 8.864 - <rect 8.865 - y="387.90286" 8.866 - x="272.40894" 8.867 - height="89.506805" 8.868 - width="101.60232" 8.869 - id="rect5081" 8.870 - style="fill:url(#linearGradient5895);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.871 - <g 8.872 - id="g5087" 8.873 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 8.874 - <rect 8.875 - y="447.72418" 8.876 - x="188.6071" 8.877 - height="48.571426" 8.878 - width="103.14286" 8.879 - id="rect5089" 8.880 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.881 - <text 8.882 - id="text5091" 8.883 - y="464.82358" 8.884 - x="197.82495" 8.885 - 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" 8.886 - xml:space="preserve"><tspan 8.887 - y="464.82358" 8.888 - x="197.82495" 8.889 - sodipodi:role="line" 8.890 - id="tspan5093">First parent</tspan></text> 8.891 - <text 8.892 - id="text5095" 8.893 - y="485.51224" 8.894 - x="197.13031" 8.895 - 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" 8.896 - xml:space="preserve"><tspan 8.897 - style="font-family:Courier" 8.898 - y="485.51224" 8.899 - x="197.13031" 8.900 - id="tspan5097" 8.901 - sodipodi:role="line">ff9dc8bc2a8b</tspan></text> 8.902 - </g> 8.903 - <g 8.904 - id="g5099" 8.905 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 8.906 - <rect 8.907 - y="447.71451" 8.908 - x="299.67859" 8.909 - height="48.571426" 8.910 - width="103.14286" 8.911 - id="rect5101" 8.912 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.913 - <text 8.914 - id="text5103" 8.915 - y="464.8139" 8.916 - x="308.89639" 8.917 - 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" 8.918 - xml:space="preserve"><tspan 8.919 - y="464.8139" 8.920 - x="308.89639" 8.921 - sodipodi:role="line" 8.922 - id="tspan5105">Second parent</tspan></text> 8.923 - <text 8.924 - id="text5107" 8.925 - y="485.50256" 8.926 - x="308.20175" 8.927 - 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" 8.928 - xml:space="preserve"><tspan 8.929 - style="font-family:Courier" 8.930 - y="485.50256" 8.931 - x="308.20175" 8.932 - id="tspan5109" 8.933 - sodipodi:role="line">000000000000</tspan></text> 8.934 - </g> 8.935 - <g 8.936 - id="g5111" 8.937 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 8.938 - <rect 8.939 - y="311.28598" 8.940 - x="188.6071" 8.941 - height="48.571426" 8.942 - width="103.14286" 8.943 - id="rect5113" 8.944 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.945 - <text 8.946 - id="text5115" 8.947 - y="328.38538" 8.948 - x="197.82495" 8.949 - 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" 8.950 - xml:space="preserve"><tspan 8.951 - y="328.38538" 8.952 - x="197.82495" 8.953 - sodipodi:role="line" 8.954 - id="tspan5117">Revision hash</tspan></text> 8.955 - <text 8.956 - id="text5119" 8.957 - y="349.07404" 8.958 - x="197.13031" 8.959 - 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" 8.960 - xml:space="preserve"><tspan 8.961 - style="font-family:Courier" 8.962 - y="349.07404" 8.963 - x="197.13031" 8.964 - id="tspan5121" 8.965 - sodipodi:role="line">ecacb6b4c9fd</tspan></text> 8.966 - </g> 8.967 - <g 8.968 - id="g5123" 8.969 - transform="matrix(0.423343,0,0,0.423343,198.4901,263.0729)"> 8.970 - <rect 8.971 - y="363.07654" 8.972 - x="187.5" 8.973 - height="75" 8.974 - width="213.85715" 8.975 - id="rect5125" 8.976 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 8.977 - <text 8.978 - id="text5127" 8.979 - y="400.86459" 8.980 - x="196.02321" 8.981 - 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" 8.982 - xml:space="preserve"><tspan 8.983 - style="fill:black;fill-opacity:1;font-family:Courier" 8.984 - y="400.86459" 8.985 - x="196.02321" 8.986 - id="tspan5129" 8.987 - sodipodi:role="line">...</tspan></text> 8.988 - <text 8.989 - id="text5131" 8.990 - y="380.17593" 8.991 - x="196.71785" 8.992 - 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" 8.993 - xml:space="preserve"><tspan 8.994 - y="380.17593" 8.995 - x="196.71785" 8.996 - sodipodi:role="line" 8.997 - id="tspan5133" 8.998 - style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 8.999 - </g> 8.1000 - <path 8.1001 - 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;display:inline" 8.1002 - d="M 299.69935,362.24027 L 299.69931,393.49494" 8.1003 - id="path5203" 8.1004 - inkscape:connector-type="polyline" 8.1005 - inkscape:connection-start="#g3457" 8.1006 - inkscape:connection-end="#g5111" /> 8.1007 - <path 8.1008 - 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" 8.1009 - d="M 182.35357,362.22647 L 241.2842,503.07224" 8.1010 - id="path5271" 8.1011 - inkscape:connector-type="polyline" 8.1012 - inkscape:connection-start="#g3399" 8.1013 - inkscape:connection-end="#g3539" /> 8.1014 - <path 8.1015 - 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;display:inline" 8.1016 - d="M 287.63109,471.81747 L 250.9438,503.07223" 8.1017 - id="path5285" 8.1018 - inkscape:connector-type="polyline" 8.1019 - inkscape:connection-start="#g5087" 8.1020 - inkscape:connection-end="#g3539" /> 8.1021 - <path 8.1022 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 8.1023 - d="M 290.80419,250.07192 L 297.80065,283.90394" 8.1024 - id="path5077" 8.1025 - inkscape:connector-type="polyline" 8.1026 - inkscape:connection-start="#g3215" 8.1027 - inkscape:connection-end="#g3481" /> 8.1028 - <path 8.1029 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 8.1030 - d="M 229.63373,250.07601 L 190.07484,283.90394" 8.1031 - id="path5075" 8.1032 - inkscape:connector-type="polyline" 8.1033 - inkscape:connection-end="#g3423" /> 8.1034 - <text 8.1035 - xml:space="preserve" 8.1036 - 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" 8.1037 - x="131.5625" 8.1038 - y="100.79968" 8.1039 - id="text5897"><tspan 8.1040 - sodipodi:role="line" 8.1041 - id="tspan5899" 8.1042 - x="131.5625" 8.1043 - y="100.79968" 8.1044 - style="text-align:end;text-anchor:end">Head revision</tspan><tspan 8.1045 - sodipodi:role="line" 8.1046 - x="131.5625" 8.1047 - y="115.79968" 8.1048 - id="tspan5901" 8.1049 - style="text-align:end;text-anchor:end">(no children)</tspan></text> 8.1050 - <text 8.1051 - xml:space="preserve" 8.1052 - 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" 8.1053 - x="131.5625" 8.1054 - y="207.04968" 8.1055 - id="text5903"><tspan 8.1056 - sodipodi:role="line" 8.1057 - id="tspan5905" 8.1058 - x="131.5625" 8.1059 - y="207.04968" 8.1060 - style="text-align:end;text-anchor:end">Merge revision</tspan><tspan 8.1061 - sodipodi:role="line" 8.1062 - x="131.5625" 8.1063 - y="222.04968" 8.1064 - id="tspan5907" 8.1065 - style="text-align:end;text-anchor:end">(two parents)</tspan></text> 8.1066 - <text 8.1067 - xml:space="preserve" 8.1068 - 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" 8.1069 - x="131.92578" 8.1070 - y="451.58093" 8.1071 - id="text5909"><tspan 8.1072 - sodipodi:role="line" 8.1073 - id="tspan5911" 8.1074 - x="131.92578" 8.1075 - y="451.58093" 8.1076 - style="text-align:end;text-anchor:end">Branches</tspan><tspan 8.1077 - sodipodi:role="line" 8.1078 - x="131.92578" 8.1079 - y="466.58093" 8.1080 - id="tspan5913" 8.1081 - style="text-align:end;text-anchor:end">(two revisions,</tspan><tspan 8.1082 - sodipodi:role="line" 8.1083 - x="131.92578" 8.1084 - y="481.58093" 8.1085 - id="tspan5915" 8.1086 - style="text-align:end;text-anchor:end">same parent)</tspan></text> 8.1087 - <path 8.1088 - 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 8.1089 - d="M 111.71875,433.61218 L 154.7268,368.52294" 8.1090 - id="path5917" 8.1091 - inkscape:connector-type="polyline" /> 8.1092 - <path 8.1093 - 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 8.1094 - d="M 134.375,464.86218 L 277.86691,440.37816" 8.1095 - id="path5919" 8.1096 - inkscape:connector-type="polyline" 8.1097 - inkscape:connection-end="#g5123" /> 8.1098 - <text 8.1099 - xml:space="preserve" 8.1100 - style="font-size:12px;font-style:normal;font-weight:normal;text-align:end;text-anchor:end;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 8.1101 - x="131.5625" 8.1102 - y="536.73718" 8.1103 - id="text5927"><tspan 8.1104 - sodipodi:role="line" 8.1105 - id="tspan5929" 8.1106 - x="131.5625" 8.1107 - y="536.73718">First revision</tspan><tspan 8.1108 - sodipodi:role="line" 8.1109 - x="131.5625" 8.1110 - y="551.73718" 8.1111 - id="tspan5931">(both parents null)</tspan></text> 8.1112 - <rect 8.1113 - style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 8.1114 - id="rect2830" 8.1115 - width="43.664806" 8.1116 - height="20.562374" 8.1117 - x="217.0432" 8.1118 - y="232.10075" /> 8.1119 - <text 8.1120 - xml:space="preserve" 8.1121 - style="font-size:5.0801158px;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" 8.1122 - x="220.94551" 8.1123 - y="239.33966" 8.1124 - id="text2832"><tspan 8.1125 - id="tspan2836" 8.1126 - sodipodi:role="line" 8.1127 - x="220.94551" 8.1128 - y="239.33966">First parent</tspan></text> 8.1129 - <text 8.1130 - xml:space="preserve" 8.1131 - style="font-size:5.0801158px;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" 8.1132 - x="220.65144" 8.1133 - y="248.09805" 8.1134 - id="text2879"><tspan 8.1135 - sodipodi:role="line" 8.1136 - id="tspan2881" 8.1137 - x="220.65144" 8.1138 - y="248.09805" 8.1139 - style="font-family:Courier">5b80c922ebdd</tspan></text> 8.1140 - <path 8.1141 - 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 8.1142 - d="M 139.84375,107.83093 L 210.15625,107.83093" 8.1143 - id="path5965" 8.1144 - inkscape:connector-type="polyline" /> 8.1145 - <path 8.1146 - 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 8.1147 - d="M 137.5,213.29968 L 210.49036,214.09055" 8.1148 - id="path5967" 8.1149 - inkscape:connector-type="polyline" /> 8.1150 - <path 8.1151 - 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 8.1152 - d="M 136.34375,544.54968 L 206.65625,544.54968" 8.1153 - id="path5969" 8.1154 - inkscape:connector-type="polyline" 8.1155 - inkscape:transform-center-y="-171.09375" 8.1156 - inkscape:transform-center-x="53.90625" /> 8.1157 - </g> 8.1158 -</svg>
9.1 --- a/en/figs/snapshot.svg Thu Mar 12 15:53:01 2009 +0800 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,202 +0,0 @@ 9.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 9.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 9.6 -<svg 9.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 9.8 - xmlns:cc="http://web.resource.org/cc/" 9.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 9.10 - xmlns:svg="http://www.w3.org/2000/svg" 9.11 - xmlns="http://www.w3.org/2000/svg" 9.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 9.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 9.14 - width="744.09448819" 9.15 - height="1052.3622047" 9.16 - id="svg2807" 9.17 - sodipodi:version="0.32" 9.18 - inkscape:version="0.44.1" 9.19 - sodipodi:docbase="/home/bos/hg/hgbook/en" 9.20 - sodipodi:docname="snapshots.svg"> 9.21 - <defs 9.22 - id="defs2809" /> 9.23 - <sodipodi:namedview 9.24 - id="base" 9.25 - pagecolor="#ffffff" 9.26 - bordercolor="#666666" 9.27 - borderopacity="1.0" 9.28 - gridtolerance="10000" 9.29 - guidetolerance="10" 9.30 - objecttolerance="10" 9.31 - inkscape:pageopacity="0.0" 9.32 - inkscape:pageshadow="2" 9.33 - inkscape:zoom="1.4" 9.34 - inkscape:cx="252.04111" 9.35 - inkscape:cy="605.75448" 9.36 - inkscape:document-units="px" 9.37 - inkscape:current-layer="layer1" 9.38 - inkscape:window-width="906" 9.39 - inkscape:window-height="721" 9.40 - inkscape:window-x="0" 9.41 - inkscape:window-y="25" /> 9.42 - <metadata 9.43 - id="metadata2812"> 9.44 - <rdf:RDF> 9.45 - <cc:Work 9.46 - rdf:about=""> 9.47 - <dc:format>image/svg+xml</dc:format> 9.48 - <dc:type 9.49 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 9.50 - </cc:Work> 9.51 - </rdf:RDF> 9.52 - </metadata> 9.53 - <g 9.54 - inkscape:label="Layer 1" 9.55 - inkscape:groupmode="layer" 9.56 - id="layer1"> 9.57 - <rect 9.58 - style="opacity:1;fill:#d3ceff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.88795626;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.59 - id="rect2817" 9.60 - width="118.18347" 9.61 - height="245.32632" 9.62 - x="243.05112" 9.63 - y="315.4133" 9.64 - inkscape:transform-center-x="136.84403" 9.65 - inkscape:transform-center-y="-66.529183" /> 9.66 - <rect 9.67 - y="315.04153" 9.68 - x="46.965065" 9.69 - height="97.803009" 9.70 - width="108.92702" 9.71 - id="rect2815" 9.72 - style="fill:#ffced6;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.14441991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 9.73 - <g 9.74 - id="g3814"> 9.75 - <rect 9.76 - y="348.94302" 9.77 - x="59.285713" 9.78 - height="30" 9.79 - width="84.285713" 9.80 - id="rect2819" 9.81 - style="fill:#ff6e86;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.82 - ry="0" /> 9.83 - <text 9.84 - id="text2821" 9.85 - y="368.02701" 9.86 - x="72.717636" 9.87 - 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" 9.88 - xml:space="preserve"><tspan 9.89 - y="368.02701" 9.90 - x="72.717636" 9.91 - id="tspan2823" 9.92 - sodipodi:role="line">Index, rev 7</tspan></text> 9.93 - </g> 9.94 - <text 9.95 - id="text3722" 9.96 - y="301.29074" 9.97 - x="46.187778" 9.98 - 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" 9.99 - xml:space="preserve"><tspan 9.100 - y="301.29074" 9.101 - x="46.187778" 9.102 - id="tspan3724" 9.103 - sodipodi:role="line">Revlog index (.i file)</tspan></text> 9.104 - <text 9.105 - id="text3726" 9.106 - y="301.29074" 9.107 - x="241.90207" 9.108 - 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" 9.109 - xml:space="preserve"><tspan 9.110 - y="301.29074" 9.111 - x="241.90207" 9.112 - id="tspan3728" 9.113 - sodipodi:role="line">Revlog data (.d file)</tspan></text> 9.114 - <path 9.115 - style="fill:#c695ff;fill-opacity:0.60109288;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 9.116 - d="M 143.57143,348.07647 L 255,368.07646 L 255.71429,544.50504 L 142.85714,379.50504 L 143.57143,348.07647 z " 9.117 - id="path3839" 9.118 - sodipodi:nodetypes="ccccc" /> 9.119 - <rect 9.120 - style="fill:#4733ff;fill-opacity:1;stroke:#a7a7a7;stroke-width:2.35124183;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.121 - id="rect3752" 9.122 - width="92.720184" 9.123 - height="67.005905" 9.124 - x="255.42564" 9.125 - y="368.64264" /> 9.126 - <text 9.127 - xml:space="preserve" 9.128 - 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" 9.129 - x="264.45859" 9.130 - y="387.30099" 9.131 - id="text3754"><tspan 9.132 - sodipodi:role="line" 9.133 - id="tspan3756" 9.134 - x="264.45859" 9.135 - y="387.30099">Snapshot, rev 4</tspan></text> 9.136 - <rect 9.137 - style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.138 - id="rect3761" 9.139 - width="93.49366" 9.140 - height="29.922237" 9.141 - x="255.03891" 9.142 - y="442.04395" /> 9.143 - <text 9.144 - xml:space="preserve" 9.145 - 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" 9.146 - x="263.2662" 9.147 - y="460.17206" 9.148 - id="text3763"><tspan 9.149 - sodipodi:role="line" 9.150 - id="tspan3765" 9.151 - x="263.2662" 9.152 - y="460.17206">Delta, rev 4 to 5</tspan></text> 9.153 - <rect 9.154 - style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.155 - id="rect3774" 9.156 - width="93.49366" 9.157 - height="29.922237" 9.158 - x="255.03891" 9.159 - y="477.97485" /> 9.160 - <text 9.161 - xml:space="preserve" 9.162 - 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" 9.163 - x="263.2662" 9.164 - y="496.10297" 9.165 - id="text3776"><tspan 9.166 - sodipodi:role="line" 9.167 - id="tspan3778" 9.168 - x="263.2662" 9.169 - y="496.10297">Delta, rev 5 to 6</tspan></text> 9.170 - <rect 9.171 - style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.172 - id="rect3782" 9.173 - width="93.49366" 9.174 - height="29.922237" 9.175 - x="255.03891" 9.176 - y="513.90576" /> 9.177 - <text 9.178 - xml:space="preserve" 9.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" 9.180 - x="263.2662" 9.181 - y="532.03387" 9.182 - id="text3784"><tspan 9.183 - sodipodi:role="line" 9.184 - id="tspan3786" 9.185 - x="263.2662" 9.186 - y="532.03387">Delta, rev 6 to 7</tspan></text> 9.187 - <rect 9.188 - style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 9.189 - id="rect3889" 9.190 - width="93.49366" 9.191 - height="29.922237" 9.192 - x="255.03891" 9.193 - y="332.32489" /> 9.194 - <text 9.195 - xml:space="preserve" 9.196 - 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" 9.197 - x="263.2662" 9.198 - y="350.453" 9.199 - id="text3891"><tspan 9.200 - sodipodi:role="line" 9.201 - id="tspan3893" 9.202 - x="263.2662" 9.203 - y="350.453">Delta, rev 2 to 3</tspan></text> 9.204 - </g> 9.205 -</svg>
10.1 --- a/en/figs/tour-history.svg Thu Mar 12 15:53:01 2009 +0800 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,289 +0,0 @@ 10.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 10.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 10.6 -<svg 10.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 10.8 - xmlns:cc="http://web.resource.org/cc/" 10.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 10.10 - xmlns:svg="http://www.w3.org/2000/svg" 10.11 - xmlns="http://www.w3.org/2000/svg" 10.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 10.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 10.14 - width="744.09448819" 10.15 - height="1052.3622047" 10.16 - id="svg2" 10.17 - sodipodi:version="0.32" 10.18 - inkscape:version="0.44.1" 10.19 - sodipodi:docname="tour-history.svg"> 10.20 - <defs 10.21 - id="defs4"> 10.22 - <marker 10.23 - inkscape:stockid="Arrow1Mstart" 10.24 - orient="auto" 10.25 - refY="0.0" 10.26 - refX="0.0" 10.27 - id="Arrow1Mstart" 10.28 - style="overflow:visible"> 10.29 - <path 10.30 - id="path2973" 10.31 - 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 " 10.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 10.33 - transform="scale(0.4) translate(10,0)" /> 10.34 - </marker> 10.35 - <marker 10.36 - inkscape:stockid="Arrow1Mend" 10.37 - orient="auto" 10.38 - refY="0.0" 10.39 - refX="0.0" 10.40 - id="Arrow1Mend" 10.41 - style="overflow:visible;"> 10.42 - <path 10.43 - id="path3066" 10.44 - 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 " 10.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 10.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 10.47 - </marker> 10.48 - </defs> 10.49 - <sodipodi:namedview 10.50 - id="base" 10.51 - pagecolor="#ffffff" 10.52 - bordercolor="#666666" 10.53 - borderopacity="1.0" 10.54 - gridtolerance="10000" 10.55 - guidetolerance="10" 10.56 - objecttolerance="10" 10.57 - inkscape:pageopacity="0.0" 10.58 - inkscape:pageshadow="2" 10.59 - inkscape:zoom="1.4" 10.60 - inkscape:cx="232.14286" 10.61 - inkscape:cy="672.75296" 10.62 - inkscape:document-units="px" 10.63 - inkscape:current-layer="layer1" 10.64 - inkscape:window-width="906" 10.65 - inkscape:window-height="620" 10.66 - inkscape:window-x="5" 10.67 - inkscape:window-y="49" /> 10.68 - <metadata 10.69 - id="metadata7"> 10.70 - <rdf:RDF> 10.71 - <cc:Work 10.72 - rdf:about=""> 10.73 - <dc:format>image/svg+xml</dc:format> 10.74 - <dc:type 10.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 10.76 - </cc:Work> 10.77 - </rdf:RDF> 10.78 - </metadata> 10.79 - <g 10.80 - inkscape:label="Layer 1" 10.81 - inkscape:groupmode="layer" 10.82 - id="layer1"> 10.83 - <rect 10.84 - style="opacity:1;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" 10.85 - id="rect1878" 10.86 - width="94.285713" 10.87 - height="20.714285" 10.88 - x="138" 10.89 - y="479.50504" /> 10.90 - <text 10.91 - xml:space="preserve" 10.92 - 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" 10.93 - x="162.09892" 10.94 - y="493.12619" 10.95 - id="text1872"><tspan 10.96 - sodipodi:role="line" 10.97 - id="tspan1874" 10.98 - x="162.09892" 10.99 - y="493.12619" 10.100 - style="font-family:Courier"><tspan 10.101 - style="font-weight:bold" 10.102 - id="tspan1876">0</tspan>: REV0</tspan></text> 10.103 - <rect 10.104 - style="opacity:1;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" 10.105 - id="rect2800" 10.106 - width="94.285713" 10.107 - height="20.714285" 10.108 - x="138" 10.109 - y="432.63004" /> 10.110 - <text 10.111 - xml:space="preserve" 10.112 - 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" 10.113 - x="162.09892" 10.114 - y="446.25119" 10.115 - id="text2794"><tspan 10.116 - sodipodi:role="line" 10.117 - id="tspan2796" 10.118 - x="162.09892" 10.119 - y="446.25119" 10.120 - style="font-family:Courier"><tspan 10.121 - id="tspan2868" 10.122 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 10.123 - <rect 10.124 - style="opacity:1;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" 10.125 - id="rect2810" 10.126 - width="94.285713" 10.127 - height="20.714285" 10.128 - x="138" 10.129 - y="385.75504" /> 10.130 - <text 10.131 - xml:space="preserve" 10.132 - 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" 10.133 - x="162.09892" 10.134 - y="399.37619" 10.135 - id="text2804"><tspan 10.136 - sodipodi:role="line" 10.137 - id="tspan2806" 10.138 - x="162.09892" 10.139 - y="399.37619" 10.140 - style="font-family:Courier"><tspan 10.141 - style="font-weight:bold" 10.142 - id="tspan2866">2</tspan>: REV2</tspan></text> 10.143 - <rect 10.144 - style="opacity:1;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" 10.145 - id="rect2820" 10.146 - width="94.285713" 10.147 - height="20.714285" 10.148 - x="138" 10.149 - y="338.88007" /> 10.150 - <text 10.151 - xml:space="preserve" 10.152 - 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" 10.153 - x="162.09892" 10.154 - y="352.50122" 10.155 - id="text2814"><tspan 10.156 - sodipodi:role="line" 10.157 - id="tspan2816" 10.158 - x="162.09892" 10.159 - y="352.50122" 10.160 - style="font-family:Courier"><tspan 10.161 - style="font-weight:bold" 10.162 - id="tspan2864">3</tspan>: REV3</tspan></text> 10.163 - <rect 10.164 - style="opacity:1;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" 10.165 - id="rect2830" 10.166 - width="94.285713" 10.167 - height="20.714285" 10.168 - x="138" 10.169 - y="292.00504" /> 10.170 - <text 10.171 - xml:space="preserve" 10.172 - 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" 10.173 - x="162.09892" 10.174 - y="305.62619" 10.175 - id="text2824"><tspan 10.176 - sodipodi:role="line" 10.177 - id="tspan2826" 10.178 - x="162.09892" 10.179 - y="305.62619" 10.180 - style="font-family:Courier"><tspan 10.181 - style="font-weight:bold" 10.182 - id="tspan2862">4</tspan>: REV4</tspan></text> 10.183 - <text 10.184 - xml:space="preserve" 10.185 - 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" 10.186 - x="173.57143" 10.187 - y="443.79074" 10.188 - id="text2832"><tspan 10.189 - sodipodi:role="line" 10.190 - id="tspan2834" 10.191 - x="173.57143" 10.192 - y="443.79074" /></text> 10.193 - <path 10.194 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 10.195 - d="M 185.14286,478.50504 L 185.14286,454.34432" 10.196 - id="path2894" 10.197 - inkscape:connector-type="polyline" /> 10.198 - <path 10.199 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 10.200 - d="M 185.14286,431.63004 L 185.14286,407.46932" 10.201 - id="path2896" 10.202 - inkscape:connector-type="polyline" /> 10.203 - <path 10.204 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 10.205 - d="M 185.14286,384.75504 L 185.14286,360.59435" 10.206 - id="path2898" 10.207 - inkscape:connector-type="polyline" /> 10.208 - <path 10.209 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 10.210 - d="M 185.14286,337.88007 L 185.14286,313.71932" 10.211 - id="path2900" 10.212 - inkscape:connector-type="polyline" /> 10.213 - <text 10.214 - xml:space="preserve" 10.215 - 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" 10.216 - x="244.60992" 10.217 - y="305.245" 10.218 - id="text1902"><tspan 10.219 - sodipodi:role="line" 10.220 - id="tspan1904" 10.221 - x="244.60992" 10.222 - y="305.245">(newest)</tspan></text> 10.223 - <text 10.224 - xml:space="preserve" 10.225 - 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" 10.226 - x="244.60992" 10.227 - y="492.745" 10.228 - id="text1906"><tspan 10.229 - sodipodi:role="line" 10.230 - id="tspan1908" 10.231 - x="244.60992" 10.232 - y="492.745">(oldest)</tspan></text> 10.233 - <rect 10.234 - style="opacity:1;fill:#d2e1e4;fill-opacity:1;stroke:#b1cbd0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 10.235 - id="rect1907" 10.236 - width="94.285713" 10.237 - height="20.714285" 10.238 - x="309.28571" 10.239 - y="324.86218" /> 10.240 - <text 10.241 - xml:space="preserve" 10.242 - 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" 10.243 - x="333.38464" 10.244 - y="338.48334" 10.245 - id="text1909"><tspan 10.246 - sodipodi:role="line" 10.247 - id="tspan1911" 10.248 - x="333.38464" 10.249 - y="338.48334" 10.250 - style="font-family:Courier"><tspan 10.251 - style="font-weight:bold" 10.252 - id="tspan1913">4</tspan>: REV4</tspan></text> 10.253 - <path 10.254 - 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" 10.255 - d="M 332.14286,375.21932 L 335.71429,347.36218" 10.256 - id="path2802" /> 10.257 - <path 10.258 - 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" 10.259 - d="M 372.69968,375.21932 L 369.12825,347.36218" 10.260 - id="path2986" /> 10.261 - <text 10.262 - xml:space="preserve" 10.263 - 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" 10.264 - x="335.14285" 10.265 - y="387.21933" 10.266 - id="text2988"><tspan 10.267 - sodipodi:role="line" 10.268 - x="335.14285" 10.269 - y="387.21933" 10.270 - id="tspan3020" 10.271 - style="text-align:end;text-anchor:end">revision</tspan><tspan 10.272 - sodipodi:role="line" 10.273 - x="335.14285" 10.274 - y="402.21933" 10.275 - id="tspan3014" 10.276 - style="text-align:end;text-anchor:end">number</tspan></text> 10.277 - <text 10.278 - xml:space="preserve" 10.279 - 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" 10.280 - x="368.71429" 10.281 - y="387.21933" 10.282 - id="text2994"><tspan 10.283 - sodipodi:role="line" 10.284 - id="tspan2996" 10.285 - x="368.71429" 10.286 - y="387.21933">changeset</tspan><tspan 10.287 - sodipodi:role="line" 10.288 - x="368.71429" 10.289 - y="402.21933" 10.290 - id="tspan2998">identifier</tspan></text> 10.291 - </g> 10.292 -</svg>
11.1 --- a/en/figs/tour-merge-conflict.svg Thu Mar 12 15:53:01 2009 +0800 11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 11.3 @@ -1,210 +0,0 @@ 11.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 11.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 11.6 -<svg 11.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 11.8 - xmlns:cc="http://web.resource.org/cc/" 11.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 11.10 - xmlns:svg="http://www.w3.org/2000/svg" 11.11 - xmlns="http://www.w3.org/2000/svg" 11.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 11.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 11.14 - width="744.09448819" 11.15 - height="1052.3622047" 11.16 - id="svg2" 11.17 - sodipodi:version="0.32" 11.18 - inkscape:version="0.44.1" 11.19 - sodipodi:docname="tour-merge-conflict.svg"> 11.20 - <defs 11.21 - id="defs4"> 11.22 - <marker 11.23 - inkscape:stockid="Arrow1Mend" 11.24 - orient="auto" 11.25 - refY="0.0" 11.26 - refX="0.0" 11.27 - id="Arrow1Mend" 11.28 - style="overflow:visible;"> 11.29 - <path 11.30 - id="path3053" 11.31 - 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 " 11.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 11.33 - transform="scale(0.4) rotate(180) translate(10,0)" /> 11.34 - </marker> 11.35 - </defs> 11.36 - <sodipodi:namedview 11.37 - id="base" 11.38 - pagecolor="#ffffff" 11.39 - bordercolor="#666666" 11.40 - borderopacity="1.0" 11.41 - gridtolerance="10000" 11.42 - guidetolerance="10" 11.43 - objecttolerance="10" 11.44 - inkscape:pageopacity="0.0" 11.45 - inkscape:pageshadow="2" 11.46 - inkscape:zoom="1.4" 11.47 - inkscape:cx="164.78349" 11.48 - inkscape:cy="590.07679" 11.49 - inkscape:document-units="px" 11.50 - inkscape:current-layer="layer1" 11.51 - inkscape:window-width="906" 11.52 - inkscape:window-height="620" 11.53 - inkscape:window-x="5" 11.54 - inkscape:window-y="49" /> 11.55 - <metadata 11.56 - id="metadata7"> 11.57 - <rdf:RDF> 11.58 - <cc:Work 11.59 - rdf:about=""> 11.60 - <dc:format>image/svg+xml</dc:format> 11.61 - <dc:type 11.62 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 11.63 - </cc:Work> 11.64 - </rdf:RDF> 11.65 - </metadata> 11.66 - <g 11.67 - inkscape:label="Layer 1" 11.68 - inkscape:groupmode="layer" 11.69 - id="layer1"> 11.70 - <g 11.71 - id="g1988" 11.72 - transform="translate(84.85711,0)"> 11.73 - <g 11.74 - id="g1876"> 11.75 - <path 11.76 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.77 - d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 11.78 - id="path1872" 11.79 - sodipodi:nodetypes="cccccc" /> 11.80 - <path 11.81 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.82 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 11.83 - id="path1874" 11.84 - sodipodi:nodetypes="cccc" /> 11.85 - </g> 11.86 - <flowRoot 11.87 - style="font-size:8px;font-family:Times New Roman" 11.88 - id="flowRoot1898" 11.89 - xml:space="preserve"><flowRegion 11.90 - id="flowRegion1900"><rect 11.91 - style="font-size:8px;font-family:Times New Roman" 11.92 - y="464.50504" 11.93 - x="122.85714" 11.94 - height="93.571426" 11.95 - width="76.428574" 11.96 - id="rect1902" /></flowRegion><flowPara 11.97 - id="flowPara1904">Greetings!</flowPara><flowPara 11.98 - id="flowPara1906" /><flowPara 11.99 - id="flowPara1908">I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 11.100 - <g 11.101 - id="g1966" 11.102 - transform="translate(82,0.35715)"> 11.103 - <g 11.104 - transform="translate(-77.85718,-140.0714)" 11.105 - id="g1910"> 11.106 - <path 11.107 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.108 - d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 11.109 - id="path1912" 11.110 - sodipodi:nodetypes="cccccc" /> 11.111 - <path 11.112 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.113 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 11.114 - id="path1914" 11.115 - sodipodi:nodetypes="cccc" /> 11.116 - </g> 11.117 - <flowRoot 11.118 - transform="translate(-77.85718,-140.0714)" 11.119 - style="font-size:8px;font-family:Times New Roman" 11.120 - id="flowRoot1916" 11.121 - xml:space="preserve"><flowRegion 11.122 - id="flowRegion1918"><rect 11.123 - style="font-size:8px;font-family:Times New Roman" 11.124 - y="464.50504" 11.125 - x="122.85714" 11.126 - height="93.571426" 11.127 - width="76.428574" 11.128 - id="rect1920" /></flowRegion><flowPara 11.129 - id="flowPara1922">Greetings!</flowPara><flowPara 11.130 - id="flowPara1924" /><flowPara 11.131 - id="flowPara1926">I am <flowSpan 11.132 - style="font-style:italic;fill:red" 11.133 - id="flowSpan3094">Shehu Musa Abacha, cousin to</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 11.134 - <g 11.135 - id="g1977" 11.136 - transform="translate(81.99999,-0.35715)"> 11.137 - <g 11.138 - transform="translate(83.57141,-139.3571)" 11.139 - id="g1932"> 11.140 - <path 11.141 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.142 - d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 11.143 - id="path1934" 11.144 - sodipodi:nodetypes="cccccc" /> 11.145 - <path 11.146 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 11.147 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 11.148 - id="path1936" 11.149 - sodipodi:nodetypes="cccc" /> 11.150 - </g> 11.151 - <flowRoot 11.152 - transform="translate(83.57141,-139.3571)" 11.153 - style="font-size:8px;font-family:Times New Roman" 11.154 - id="flowRoot1938" 11.155 - xml:space="preserve"><flowRegion 11.156 - id="flowRegion1940"><rect 11.157 - style="font-size:8px;font-family:Times New Roman" 11.158 - y="464.50504" 11.159 - x="122.85714" 11.160 - height="93.571426" 11.161 - width="76.428574" 11.162 - id="rect1942" /></flowRegion><flowPara 11.163 - id="flowPara1944">Greetings!</flowPara><flowPara 11.164 - id="flowPara1946" /><flowPara 11.165 - id="flowPara1948">I am <flowSpan 11.166 - style="font-style:italic;fill:red" 11.167 - id="flowSpan3096">Alhaji Abba Abacha, son of</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 11.168 - <path 11.169 - 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" 11.170 - d="M 215.502,457.71933 L 196.35507,424.5765" 11.171 - id="path1999" 11.172 - inkscape:connector-type="polyline" 11.173 - inkscape:connection-start="#g1988" 11.174 - inkscape:connection-end="#g1966" /> 11.175 - <path 11.176 - 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" 11.177 - d="M 277.06936,457.71933 L 296.21629,424.5765" 11.178 - id="path2001" 11.179 - inkscape:connector-type="polyline" 11.180 - inkscape:connection-start="#g1988" 11.181 - inkscape:connection-end="#g1977" /> 11.182 - <text 11.183 - xml:space="preserve" 11.184 - 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" 11.185 - x="302.42859" 11.186 - y="515.08905" 11.187 - id="text1905"><tspan 11.188 - sodipodi:role="line" 11.189 - id="tspan1907" 11.190 - x="302.42859" 11.191 - y="515.08905">Base version</tspan></text> 11.192 - <text 11.193 - xml:space="preserve" 11.194 - 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" 11.195 - x="45.57143" 11.196 - y="374.1619" 11.197 - id="text1917"><tspan 11.198 - sodipodi:role="line" 11.199 - id="tspan1919" 11.200 - x="45.57143" 11.201 - y="374.1619">Our changes</tspan></text> 11.202 - <text 11.203 - xml:space="preserve" 11.204 - 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" 11.205 - x="385.71429" 11.206 - y="374.1619" 11.207 - id="text1921"><tspan 11.208 - sodipodi:role="line" 11.209 - id="tspan1923" 11.210 - x="385.71429" 11.211 - y="374.1619">Their changes</tspan></text> 11.212 - </g> 11.213 -</svg>
12.1 --- a/en/figs/tour-merge-merge.svg Thu Mar 12 15:53:01 2009 +0800 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,380 +0,0 @@ 12.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 12.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 12.6 -<svg 12.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 12.8 - xmlns:cc="http://web.resource.org/cc/" 12.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 12.10 - xmlns:svg="http://www.w3.org/2000/svg" 12.11 - xmlns="http://www.w3.org/2000/svg" 12.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 12.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 12.14 - width="744.09448819" 12.15 - height="1052.3622047" 12.16 - id="svg2" 12.17 - sodipodi:version="0.32" 12.18 - inkscape:version="0.44.1" 12.19 - sodipodi:docname="tour-merge-merge.svg"> 12.20 - <defs 12.21 - id="defs4"> 12.22 - <marker 12.23 - inkscape:stockid="Arrow1Mstart" 12.24 - orient="auto" 12.25 - refY="0.0" 12.26 - refX="0.0" 12.27 - id="Arrow1Mstart" 12.28 - style="overflow:visible"> 12.29 - <path 12.30 - id="path2973" 12.31 - 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 " 12.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 12.33 - transform="scale(0.4) translate(10,0)" /> 12.34 - </marker> 12.35 - <marker 12.36 - inkscape:stockid="Arrow1Mend" 12.37 - orient="auto" 12.38 - refY="0.0" 12.39 - refX="0.0" 12.40 - id="Arrow1Mend" 12.41 - style="overflow:visible;"> 12.42 - <path 12.43 - id="path3066" 12.44 - 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 " 12.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 12.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 12.47 - </marker> 12.48 - </defs> 12.49 - <sodipodi:namedview 12.50 - id="base" 12.51 - pagecolor="#ffffff" 12.52 - bordercolor="#666666" 12.53 - borderopacity="1.0" 12.54 - gridtolerance="10000" 12.55 - guidetolerance="10" 12.56 - objecttolerance="10" 12.57 - inkscape:pageopacity="0.0" 12.58 - inkscape:pageshadow="2" 12.59 - inkscape:zoom="1.4" 12.60 - inkscape:cx="247.53795" 12.61 - inkscape:cy="871.05738" 12.62 - inkscape:document-units="px" 12.63 - inkscape:current-layer="layer1" 12.64 - inkscape:window-width="906" 12.65 - inkscape:window-height="620" 12.66 - inkscape:window-x="38" 12.67 - inkscape:window-y="95" /> 12.68 - <metadata 12.69 - id="metadata7"> 12.70 - <rdf:RDF> 12.71 - <cc:Work 12.72 - rdf:about=""> 12.73 - <dc:format>image/svg+xml</dc:format> 12.74 - <dc:type 12.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 12.76 - </cc:Work> 12.77 - </rdf:RDF> 12.78 - </metadata> 12.79 - <g 12.80 - inkscape:label="Layer 1" 12.81 - inkscape:groupmode="layer" 12.82 - id="layer1"> 12.83 - <rect 12.84 - 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" 12.85 - id="rect2995" 12.86 - width="94.285713" 12.87 - height="20.714285" 12.88 - x="532.85718" 12.89 - y="203.0479" /> 12.90 - <text 12.91 - xml:space="preserve" 12.92 - 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" 12.93 - x="173.57143" 12.94 - y="443.79074" 12.95 - id="text2832"><tspan 12.96 - sodipodi:role="line" 12.97 - id="tspan2834" 12.98 - x="173.57143" 12.99 - y="443.79074" /></text> 12.100 - <rect 12.101 - 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" 12.102 - id="rect2830" 12.103 - width="94.285713" 12.104 - height="20.714285" 12.105 - x="138" 12.106 - y="297.76227" /> 12.107 - <text 12.108 - xml:space="preserve" 12.109 - 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" 12.110 - x="162.09892" 12.111 - y="311.38342" 12.112 - id="text2824"><tspan 12.113 - sodipodi:role="line" 12.114 - id="tspan2826" 12.115 - x="162.09892" 12.116 - y="311.38342" 12.117 - style="font-family:Courier"><tspan 12.118 - style="font-weight:bold" 12.119 - id="tspan2862">4</tspan>: REV4</tspan></text> 12.120 - <path 12.121 - 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" 12.122 - d="M 185.14286,343.63731 L 185.14286,319.47656" 12.123 - id="path2900" 12.124 - inkscape:connector-type="polyline" /> 12.125 - <rect 12.126 - 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" 12.127 - id="rect2863" 12.128 - width="94.285713" 12.129 - height="20.714285" 12.130 - x="91.428574" 12.131 - y="250.47656" /> 12.132 - <text 12.133 - xml:space="preserve" 12.134 - 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" 12.135 - x="116.09886" 12.136 - y="264.56592" 12.137 - id="text1965" 12.138 - transform="scale(1.000002,0.999998)"><tspan 12.139 - sodipodi:role="line" 12.140 - id="tspan1967" 12.141 - x="116.09886" 12.142 - y="264.56592" 12.143 - style="font-family:Courier"><tspan 12.144 - style="font-weight:bold" 12.145 - id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 12.146 - <path 12.147 - 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" 12.148 - d="M 173.95727,296.76228 L 149.75702,272.19085" 12.149 - id="path1971" 12.150 - inkscape:connector-type="polyline" 12.151 - inkscape:connection-end="#rect2863" 12.152 - inkscape:connection-start="#rect2830" /> 12.153 - <rect 12.154 - 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" 12.155 - id="rect2911" 12.156 - width="94.285995" 12.157 - height="20.714283" 12.158 - x="186.71414" 12.159 - y="204.40514" /> 12.160 - <text 12.161 - xml:space="preserve" 12.162 - 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" 12.163 - x="210.81311" 12.164 - y="218.02673" 12.165 - id="text2913" 12.166 - transform="scale(1.000002,0.999998)"><tspan 12.167 - sodipodi:role="line" 12.168 - id="tspan2915" 12.169 - x="210.81311" 12.170 - y="218.02673" 12.171 - style="font-family:Courier"><tspan 12.172 - id="tspan1966" 12.173 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 12.174 - <path 12.175 - 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" 12.176 - d="M 191.06908,296.76228 L 227.93092,226.11942" 12.177 - id="path2919" 12.178 - inkscape:connector-type="polyline" 12.179 - inkscape:connection-start="#rect2830" /> 12.180 - <text 12.181 - xml:space="preserve" 12.182 - 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" 12.183 - x="295.28571" 12.184 - y="217.56711" 12.185 - id="text2871"><tspan 12.186 - sodipodi:role="line" 12.187 - id="tspan2873" 12.188 - x="295.28571" 12.189 - y="217.56711">tip (and head)</tspan></text> 12.190 - <text 12.191 - xml:space="preserve" 12.192 - 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" 12.193 - x="76" 12.194 - y="264.91769" 12.195 - id="text2875"><tspan 12.196 - sodipodi:role="line" 12.197 - id="tspan2877" 12.198 - x="76" 12.199 - y="264.91769" 12.200 - style="text-align:end;text-anchor:end">head</tspan></text> 12.201 - <rect 12.202 - 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" 12.203 - id="rect1913" 12.204 - width="94.285713" 12.205 - height="20.714285" 12.206 - x="138" 12.207 - y="156.90514" /> 12.208 - <path 12.209 - 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" 12.210 - d="M 144.22399,249.47657 L 179.49029,178.61943" 12.211 - id="path1915" 12.212 - inkscape:connector-type="polyline" 12.213 - inkscape:connection-start="#rect2863" 12.214 - inkscape:connection-end="#rect1913" /> 12.215 - <path 12.216 - 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" 12.217 - d="M 222.20966,203.40514 L 196.79033,178.61943" 12.218 - id="path1917" 12.219 - inkscape:connector-type="polyline" 12.220 - inkscape:connection-start="#rect2911" 12.221 - inkscape:connection-end="#rect1913" /> 12.222 - <text 12.223 - xml:space="preserve" 12.224 - 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" 12.225 - x="166.16823" 12.226 - y="168.52228" 12.227 - id="text2806"><tspan 12.228 - sodipodi:role="line" 12.229 - id="tspan2808" 12.230 - x="166.16823" 12.231 - y="168.52228" 12.232 - style="font-family:Courier">merge</tspan></text> 12.233 - <text 12.234 - xml:space="preserve" 12.235 - 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" 12.236 - x="246" 12.237 - y="162.63338" 12.238 - id="text2810"><tspan 12.239 - sodipodi:role="line" 12.240 - id="tspan2812" 12.241 - x="246" 12.242 - y="162.63338">working directory</tspan><tspan 12.243 - sodipodi:role="line" 12.244 - x="246" 12.245 - y="177.63338" 12.246 - id="tspan2814">during merge</tspan></text> 12.247 - <rect 12.248 - 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" 12.249 - id="rect2816" 12.250 - width="94.285713" 12.251 - height="20.714285" 12.252 - x="483.14636" 12.253 - y="297.76227" /> 12.254 - <text 12.255 - xml:space="preserve" 12.256 - 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" 12.257 - x="507.24527" 12.258 - y="311.38342" 12.259 - id="text2818"><tspan 12.260 - sodipodi:role="line" 12.261 - id="tspan2820" 12.262 - x="507.24527" 12.263 - y="311.38342" 12.264 - style="font-family:Courier"><tspan 12.265 - style="font-weight:bold" 12.266 - id="tspan2822">4</tspan>: REV4</tspan></text> 12.267 - <path 12.268 - 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" 12.269 - d="M 530.28921,343.6373 L 530.28921,319.47655" 12.270 - id="path2824" 12.271 - inkscape:connector-type="polyline" /> 12.272 - <rect 12.273 - 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" 12.274 - id="rect2826" 12.275 - width="94.285713" 12.276 - height="20.714285" 12.277 - x="436.57492" 12.278 - y="250.47656" /> 12.279 - <text 12.280 - xml:space="preserve" 12.281 - 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" 12.282 - x="461.24484" 12.283 - y="264.56613" 12.284 - id="text2828" 12.285 - transform="scale(1.000002,0.999998)"><tspan 12.286 - sodipodi:role="line" 12.287 - id="tspan2830" 12.288 - x="461.24484" 12.289 - y="264.56613" 12.290 - style="font-family:Courier"><tspan 12.291 - style="font-weight:bold" 12.292 - id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 12.293 - <path 12.294 - 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" 12.295 - d="M 519.10362,296.76227 L 494.90337,272.19084" 12.296 - id="path2834" 12.297 - inkscape:connector-type="polyline" /> 12.298 - <rect 12.299 - 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" 12.300 - id="rect2836" 12.301 - width="94.285995" 12.302 - height="20.714283" 12.303 - x="483.14001" 12.304 - y="156.548" /> 12.305 - <text 12.306 - xml:space="preserve" 12.307 - 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" 12.308 - x="555.95911" 12.309 - y="218.02698" 12.310 - id="text2838" 12.311 - transform="scale(1.000002,0.999998)"><tspan 12.312 - sodipodi:role="line" 12.313 - id="tspan2840" 12.314 - x="555.95911" 12.315 - y="218.02698" 12.316 - style="font-family:Courier"><tspan 12.317 - id="tspan2842" 12.318 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 12.319 - <path 12.320 - 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" 12.321 - d="M 536.21543,296.76227 L 574.03453,224.76218" 12.322 - id="path2844" 12.323 - inkscape:connector-type="polyline" /> 12.324 - <text 12.325 - xml:space="preserve" 12.326 - 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" 12.327 - x="594.43207" 12.328 - y="169.78796" 12.329 - id="text2846"><tspan 12.330 - sodipodi:role="line" 12.331 - id="tspan2848" 12.332 - x="594.43207" 12.333 - y="169.78796">tip</tspan></text> 12.334 - <path 12.335 - 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" 12.336 - d="M 489.37034,249.47656 L 524.65575,178.26229" 12.337 - id="path2856" 12.338 - inkscape:connector-type="polyline" 12.339 - inkscape:connection-end="#rect2836" /> 12.340 - <path 12.341 - 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" 12.342 - d="M 567.85714,202.0479 L 542.42591,178.26229" 12.343 - id="path2858" 12.344 - inkscape:connector-type="polyline" 12.345 - inkscape:connection-end="#rect2836" 12.346 - inkscape:connection-start="#rect2995" /> 12.347 - <text 12.348 - xml:space="preserve" 12.349 - 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" 12.350 - x="504.54507" 12.351 - y="170.39714" 12.352 - id="text2860"><tspan 12.353 - sodipodi:role="line" 12.354 - id="tspan2863" 12.355 - x="504.54507" 12.356 - y="170.39714" 12.357 - style="font-family:Courier"><tspan 12.358 - style="font-weight:bold" 12.359 - id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 12.360 - <text 12.361 - xml:space="preserve" 12.362 - 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" 12.363 - x="90.323105" 12.364 - y="120.21933" 12.365 - id="text2929"><tspan 12.366 - sodipodi:role="line" 12.367 - id="tspan2931" 12.368 - x="90.323105" 12.369 - y="120.21933" 12.370 - style="font-weight:bold">Working directory during merge</tspan></text> 12.371 - <text 12.372 - xml:space="preserve" 12.373 - 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" 12.374 - x="435.35226" 12.375 - y="120.21933" 12.376 - id="text2937"><tspan 12.377 - sodipodi:role="line" 12.378 - id="tspan2939" 12.379 - x="435.35226" 12.380 - y="120.21933" 12.381 - style="font-weight:bold">Repository after merge committed</tspan></text> 12.382 - </g> 12.383 -</svg>
13.1 --- a/en/figs/tour-merge-pull.svg Thu Mar 12 15:53:01 2009 +0800 13.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 13.3 @@ -1,288 +0,0 @@ 13.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 13.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 13.6 -<svg 13.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 13.8 - xmlns:cc="http://web.resource.org/cc/" 13.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 13.10 - xmlns:svg="http://www.w3.org/2000/svg" 13.11 - xmlns="http://www.w3.org/2000/svg" 13.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 13.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 13.14 - width="744.09448819" 13.15 - height="1052.3622047" 13.16 - id="svg2" 13.17 - sodipodi:version="0.32" 13.18 - inkscape:version="0.44.1" 13.19 - sodipodi:docname="tour-merge-pull.svg" 13.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 13.21 - <defs 13.22 - id="defs4"> 13.23 - <marker 13.24 - inkscape:stockid="Arrow1Mstart" 13.25 - orient="auto" 13.26 - refY="0.0" 13.27 - refX="0.0" 13.28 - id="Arrow1Mstart" 13.29 - style="overflow:visible"> 13.30 - <path 13.31 - id="path2973" 13.32 - 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 " 13.33 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 13.34 - transform="scale(0.4) translate(10,0)" /> 13.35 - </marker> 13.36 - <marker 13.37 - inkscape:stockid="Arrow1Mend" 13.38 - orient="auto" 13.39 - refY="0.0" 13.40 - refX="0.0" 13.41 - id="Arrow1Mend" 13.42 - style="overflow:visible;"> 13.43 - <path 13.44 - id="path3066" 13.45 - 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 " 13.46 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 13.47 - transform="scale(0.4) rotate(180) translate(10,0)" /> 13.48 - </marker> 13.49 - </defs> 13.50 - <sodipodi:namedview 13.51 - id="base" 13.52 - pagecolor="#ffffff" 13.53 - bordercolor="#666666" 13.54 - borderopacity="1.0" 13.55 - gridtolerance="10000" 13.56 - guidetolerance="10" 13.57 - objecttolerance="10" 13.58 - inkscape:pageopacity="0.0" 13.59 - inkscape:pageshadow="2" 13.60 - inkscape:zoom="1.4" 13.61 - inkscape:cx="233.63208" 13.62 - inkscape:cy="832.54381" 13.63 - inkscape:document-units="px" 13.64 - inkscape:current-layer="layer1" 13.65 - inkscape:window-width="906" 13.66 - inkscape:window-height="620" 13.67 - inkscape:window-x="237" 13.68 - inkscape:window-y="103" /> 13.69 - <metadata 13.70 - id="metadata7"> 13.71 - <rdf:RDF> 13.72 - <cc:Work 13.73 - rdf:about=""> 13.74 - <dc:format>image/svg+xml</dc:format> 13.75 - <dc:type 13.76 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 13.77 - </cc:Work> 13.78 - </rdf:RDF> 13.79 - </metadata> 13.80 - <g 13.81 - inkscape:label="Layer 1" 13.82 - inkscape:groupmode="layer" 13.83 - id="layer1"> 13.84 - <text 13.85 - xml:space="preserve" 13.86 - 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" 13.87 - x="173.57143" 13.88 - y="443.79074" 13.89 - id="text2832"><tspan 13.90 - sodipodi:role="line" 13.91 - id="tspan2834" 13.92 - x="173.57143" 13.93 - y="443.79074" /></text> 13.94 - <rect 13.95 - 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" 13.96 - id="rect1878" 13.97 - width="94.285713" 13.98 - height="20.714285" 13.99 - x="138" 13.100 - y="479.50504" /> 13.101 - <text 13.102 - xml:space="preserve" 13.103 - 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" 13.104 - x="162.09892" 13.105 - y="493.12619" 13.106 - id="text1872"><tspan 13.107 - sodipodi:role="line" 13.108 - id="tspan1874" 13.109 - x="162.09892" 13.110 - y="493.12619" 13.111 - style="font-family:Courier"><tspan 13.112 - style="font-weight:bold" 13.113 - id="tspan1876">0</tspan>: REV0</tspan></text> 13.114 - <rect 13.115 - 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" 13.116 - id="rect2800" 13.117 - width="94.285713" 13.118 - height="20.714285" 13.119 - x="138" 13.120 - y="432.63004" /> 13.121 - <text 13.122 - xml:space="preserve" 13.123 - 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" 13.124 - x="162.09892" 13.125 - y="446.25119" 13.126 - id="text2794"><tspan 13.127 - sodipodi:role="line" 13.128 - id="tspan2796" 13.129 - x="162.09892" 13.130 - y="446.25119" 13.131 - style="font-family:Courier"><tspan 13.132 - id="tspan2868" 13.133 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 13.134 - <rect 13.135 - 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" 13.136 - id="rect2810" 13.137 - width="94.285713" 13.138 - height="20.714285" 13.139 - x="138" 13.140 - y="385.75504" /> 13.141 - <text 13.142 - xml:space="preserve" 13.143 - 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" 13.144 - x="162.09892" 13.145 - y="399.37619" 13.146 - id="text2804"><tspan 13.147 - sodipodi:role="line" 13.148 - id="tspan2806" 13.149 - x="162.09892" 13.150 - y="399.37619" 13.151 - style="font-family:Courier"><tspan 13.152 - style="font-weight:bold" 13.153 - id="tspan2866">2</tspan>: REV2</tspan></text> 13.154 - <rect 13.155 - 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" 13.156 - id="rect2820" 13.157 - width="94.285713" 13.158 - height="20.714285" 13.159 - x="138" 13.160 - y="338.88007" /> 13.161 - <text 13.162 - xml:space="preserve" 13.163 - 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" 13.164 - x="162.09892" 13.165 - y="352.50122" 13.166 - id="text2814"><tspan 13.167 - sodipodi:role="line" 13.168 - id="tspan2816" 13.169 - x="162.09892" 13.170 - y="352.50122" 13.171 - style="font-family:Courier"><tspan 13.172 - style="font-weight:bold" 13.173 - id="tspan2864">3</tspan>: REV3</tspan></text> 13.174 - <rect 13.175 - 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" 13.176 - id="rect2830" 13.177 - width="94.285713" 13.178 - height="20.714285" 13.179 - x="138" 13.180 - y="292.00504" /> 13.181 - <text 13.182 - xml:space="preserve" 13.183 - 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" 13.184 - x="162.09892" 13.185 - y="305.62619" 13.186 - id="text2824"><tspan 13.187 - sodipodi:role="line" 13.188 - id="tspan2826" 13.189 - x="162.09892" 13.190 - y="305.62619" 13.191 - style="font-family:Courier"><tspan 13.192 - style="font-weight:bold" 13.193 - id="tspan2862">4</tspan>: REV4</tspan></text> 13.194 - <path 13.195 - 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" 13.196 - d="M 185.14286,478.50504 L 185.14286,454.34432" 13.197 - id="path2894" 13.198 - inkscape:connector-type="polyline" /> 13.199 - <path 13.200 - 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" 13.201 - d="M 185.14286,431.63004 L 185.14286,407.46932" 13.202 - id="path2896" 13.203 - inkscape:connector-type="polyline" /> 13.204 - <path 13.205 - 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" 13.206 - d="M 185.14286,384.75504 L 185.14286,360.59435" 13.207 - id="path2898" 13.208 - inkscape:connector-type="polyline" /> 13.209 - <path 13.210 - 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" 13.211 - d="M 185.14286,337.88007 L 185.14286,313.71932" 13.212 - id="path2900" 13.213 - inkscape:connector-type="polyline" /> 13.214 - <rect 13.215 - 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" 13.216 - id="rect2863" 13.217 - width="94.285713" 13.218 - height="20.714285" 13.219 - x="91.428574" 13.220 - y="244.71933" /> 13.221 - <text 13.222 - xml:space="preserve" 13.223 - 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" 13.224 - x="116.09886" 13.225 - y="258.80865" 13.226 - id="text1965" 13.227 - transform="scale(1.000002,0.999998)"><tspan 13.228 - sodipodi:role="line" 13.229 - id="tspan1967" 13.230 - x="116.09886" 13.231 - y="258.80865" 13.232 - style="font-family:Courier"><tspan 13.233 - style="font-weight:bold" 13.234 - id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 13.235 - <path 13.236 - 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" 13.237 - d="M 173.95727,291.00504 L 149.75702,266.43361" 13.238 - id="path1971" 13.239 - inkscape:connector-type="polyline" 13.240 - inkscape:connection-end="#rect2863" 13.241 - inkscape:connection-start="#rect2830" /> 13.242 - <rect 13.243 - 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" 13.244 - id="rect2911" 13.245 - width="94.285995" 13.246 - height="20.714283" 13.247 - x="186.71414" 13.248 - y="198.6479" /> 13.249 - <text 13.250 - xml:space="preserve" 13.251 - 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" 13.252 - x="210.81311" 13.253 - y="212.26949" 13.254 - id="text2913" 13.255 - transform="scale(1.000002,0.999998)"><tspan 13.256 - sodipodi:role="line" 13.257 - id="tspan2915" 13.258 - x="210.81311" 13.259 - y="212.26949" 13.260 - style="font-family:Courier"><tspan 13.261 - id="tspan1966" 13.262 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 13.263 - <path 13.264 - 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" 13.265 - d="M 191.06908,291.00504 L 227.93092,220.36218" 13.266 - id="path2919" 13.267 - inkscape:connector-type="polyline" 13.268 - inkscape:connection-start="#rect2830" /> 13.269 - <text 13.270 - xml:space="preserve" 13.271 - 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" 13.272 - x="295.28571" 13.273 - y="211.80988" 13.274 - id="text2871"><tspan 13.275 - sodipodi:role="line" 13.276 - id="tspan2873" 13.277 - x="295.28571" 13.278 - y="211.80988">tip (and head)</tspan></text> 13.279 - <text 13.280 - xml:space="preserve" 13.281 - 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" 13.282 - x="76" 13.283 - y="259.16046" 13.284 - id="text2875"><tspan 13.285 - sodipodi:role="line" 13.286 - id="tspan2877" 13.287 - x="76" 13.288 - y="259.16046" 13.289 - style="text-align:end;text-anchor:end">head</tspan></text> 13.290 - </g> 13.291 -</svg>
14.1 --- a/en/figs/tour-merge-sep-repos.svg Thu Mar 12 15:53:01 2009 +0800 14.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 14.3 @@ -1,466 +0,0 @@ 14.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 14.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 14.6 -<svg 14.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 14.8 - xmlns:cc="http://web.resource.org/cc/" 14.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 14.10 - xmlns:svg="http://www.w3.org/2000/svg" 14.11 - xmlns="http://www.w3.org/2000/svg" 14.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 14.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 14.14 - width="744.09448819" 14.15 - height="1052.3622047" 14.16 - id="svg2" 14.17 - sodipodi:version="0.32" 14.18 - inkscape:version="0.44.1" 14.19 - sodipodi:docname="tour-merge-sep-repos.svg"> 14.20 - <defs 14.21 - id="defs4"> 14.22 - <marker 14.23 - inkscape:stockid="Arrow1Mstart" 14.24 - orient="auto" 14.25 - refY="0.0" 14.26 - refX="0.0" 14.27 - id="Arrow1Mstart" 14.28 - style="overflow:visible"> 14.29 - <path 14.30 - id="path2973" 14.31 - 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 " 14.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 14.33 - transform="scale(0.4) translate(10,0)" /> 14.34 - </marker> 14.35 - <marker 14.36 - inkscape:stockid="Arrow1Mend" 14.37 - orient="auto" 14.38 - refY="0.0" 14.39 - refX="0.0" 14.40 - id="Arrow1Mend" 14.41 - style="overflow:visible;"> 14.42 - <path 14.43 - id="path3066" 14.44 - 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 " 14.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 14.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 14.47 - </marker> 14.48 - </defs> 14.49 - <sodipodi:namedview 14.50 - id="base" 14.51 - pagecolor="#ffffff" 14.52 - bordercolor="#666666" 14.53 - borderopacity="1.0" 14.54 - gridtolerance="10000" 14.55 - guidetolerance="10" 14.56 - objecttolerance="10" 14.57 - inkscape:pageopacity="0.0" 14.58 - inkscape:pageshadow="2" 14.59 - inkscape:zoom="1.4" 14.60 - inkscape:cx="307.20351" 14.61 - inkscape:cy="716.87911" 14.62 - inkscape:document-units="px" 14.63 - inkscape:current-layer="layer1" 14.64 - inkscape:window-width="906" 14.65 - inkscape:window-height="620" 14.66 - inkscape:window-x="5" 14.67 - inkscape:window-y="49" /> 14.68 - <metadata 14.69 - id="metadata7"> 14.70 - <rdf:RDF> 14.71 - <cc:Work 14.72 - rdf:about=""> 14.73 - <dc:format>image/svg+xml</dc:format> 14.74 - <dc:type 14.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 14.76 - </cc:Work> 14.77 - </rdf:RDF> 14.78 - </metadata> 14.79 - <g 14.80 - inkscape:label="Layer 1" 14.81 - inkscape:groupmode="layer" 14.82 - id="layer1"> 14.83 - <text 14.84 - xml:space="preserve" 14.85 - 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" 14.86 - x="173.57143" 14.87 - y="443.79074" 14.88 - id="text2832"><tspan 14.89 - sodipodi:role="line" 14.90 - id="tspan2834" 14.91 - x="173.57143" 14.92 - y="443.79074" /></text> 14.93 - <rect 14.94 - 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" 14.95 - id="rect1878" 14.96 - width="94.285713" 14.97 - height="20.714285" 14.98 - x="138" 14.99 - y="479.50504" /> 14.100 - <text 14.101 - xml:space="preserve" 14.102 - 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" 14.103 - x="162.09892" 14.104 - y="493.12619" 14.105 - id="text1872"><tspan 14.106 - sodipodi:role="line" 14.107 - id="tspan1874" 14.108 - x="162.09892" 14.109 - y="493.12619" 14.110 - style="font-family:Courier"><tspan 14.111 - style="font-weight:bold" 14.112 - id="tspan1876">0</tspan>: REV0</tspan></text> 14.113 - <rect 14.114 - 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" 14.115 - id="rect2800" 14.116 - width="94.285713" 14.117 - height="20.714285" 14.118 - x="138" 14.119 - y="432.63004" /> 14.120 - <text 14.121 - xml:space="preserve" 14.122 - 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" 14.123 - x="162.09892" 14.124 - y="446.25119" 14.125 - id="text2794"><tspan 14.126 - sodipodi:role="line" 14.127 - id="tspan2796" 14.128 - x="162.09892" 14.129 - y="446.25119" 14.130 - style="font-family:Courier"><tspan 14.131 - id="tspan2868" 14.132 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 14.133 - <rect 14.134 - 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" 14.135 - id="rect2810" 14.136 - width="94.285713" 14.137 - height="20.714285" 14.138 - x="138" 14.139 - y="385.75504" /> 14.140 - <text 14.141 - xml:space="preserve" 14.142 - 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" 14.143 - x="162.09892" 14.144 - y="399.37619" 14.145 - id="text2804"><tspan 14.146 - sodipodi:role="line" 14.147 - id="tspan2806" 14.148 - x="162.09892" 14.149 - y="399.37619" 14.150 - style="font-family:Courier"><tspan 14.151 - style="font-weight:bold" 14.152 - id="tspan2866">2</tspan>: REV2</tspan></text> 14.153 - <rect 14.154 - 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" 14.155 - id="rect2820" 14.156 - width="94.285713" 14.157 - height="20.714285" 14.158 - x="138" 14.159 - y="338.88007" /> 14.160 - <text 14.161 - xml:space="preserve" 14.162 - 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" 14.163 - x="162.09892" 14.164 - y="352.50122" 14.165 - id="text2814"><tspan 14.166 - sodipodi:role="line" 14.167 - id="tspan2816" 14.168 - x="162.09892" 14.169 - y="352.50122" 14.170 - style="font-family:Courier"><tspan 14.171 - style="font-weight:bold" 14.172 - id="tspan2864">3</tspan>: REV3</tspan></text> 14.173 - <rect 14.174 - 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" 14.175 - id="rect2830" 14.176 - width="94.285713" 14.177 - height="20.714285" 14.178 - x="138" 14.179 - y="292.00504" /> 14.180 - <text 14.181 - xml:space="preserve" 14.182 - 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" 14.183 - x="162.09892" 14.184 - y="305.62619" 14.185 - id="text2824"><tspan 14.186 - sodipodi:role="line" 14.187 - id="tspan2826" 14.188 - x="162.09892" 14.189 - y="305.62619" 14.190 - style="font-family:Courier"><tspan 14.191 - style="font-weight:bold" 14.192 - id="tspan2862">4</tspan>: REV4</tspan></text> 14.193 - <path 14.194 - 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" 14.195 - d="M 185.14286,478.50504 L 185.14286,454.34432" 14.196 - id="path2894" 14.197 - inkscape:connector-type="polyline" /> 14.198 - <path 14.199 - 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" 14.200 - d="M 185.14286,431.63004 L 185.14286,407.46932" 14.201 - id="path2896" 14.202 - inkscape:connector-type="polyline" /> 14.203 - <path 14.204 - 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" 14.205 - d="M 185.14286,384.75504 L 185.14286,360.59435" 14.206 - id="path2898" 14.207 - inkscape:connector-type="polyline" /> 14.208 - <path 14.209 - 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" 14.210 - d="M 185.14286,337.88007 L 185.14286,313.71932" 14.211 - id="path2900" 14.212 - inkscape:connector-type="polyline" /> 14.213 - <rect 14.214 - 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" 14.215 - id="rect1963" 14.216 - width="94.285995" 14.217 - height="20.714283" 14.218 - x="138" 14.219 - y="245.18723" /> 14.220 - <text 14.221 - xml:space="preserve" 14.222 - 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" 14.223 - x="162.09877" 14.224 - y="258.80865" 14.225 - id="text1965" 14.226 - transform="scale(1.000002,0.999998)"><tspan 14.227 - sodipodi:role="line" 14.228 - id="tspan1967" 14.229 - x="162.09877" 14.230 - y="258.80865" 14.231 - style="font-family:Courier"><tspan 14.232 - style="font-weight:bold" 14.233 - id="tspan1973">5</tspan>: REV_my_hello</tspan></text> 14.234 - <path 14.235 - 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" 14.236 - d="M 185.143,291.06218 L 185.143,266.90143" 14.237 - id="path1971" 14.238 - inkscape:connector-type="polyline" /> 14.239 - <text 14.240 - xml:space="preserve" 14.241 - 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" 14.242 - x="136.90039" 14.243 - y="232.25546" 14.244 - id="text2921"><tspan 14.245 - sodipodi:role="line" 14.246 - id="tspan2923" 14.247 - x="136.90039" 14.248 - y="232.25546">my-hello</tspan></text> 14.249 - <rect 14.250 - 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" 14.251 - id="rect2863" 14.252 - width="94.285713" 14.253 - height="20.714285" 14.254 - x="370.71414" 14.255 - y="479.49289" /> 14.256 - <text 14.257 - xml:space="preserve" 14.258 - 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" 14.259 - x="394.81305" 14.260 - y="493.11404" 14.261 - id="text2865"><tspan 14.262 - sodipodi:role="line" 14.263 - id="tspan2867" 14.264 - x="394.81305" 14.265 - y="493.11404" 14.266 - style="font-family:Courier"><tspan 14.267 - style="font-weight:bold" 14.268 - id="tspan2869">0</tspan>: REV0</tspan></text> 14.269 - <rect 14.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" 14.271 - id="rect2871" 14.272 - width="94.285713" 14.273 - height="20.714285" 14.274 - x="370.71414" 14.275 - y="432.61789" /> 14.276 - <text 14.277 - xml:space="preserve" 14.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:Courier" 14.279 - x="394.81305" 14.280 - y="446.23904" 14.281 - id="text2873"><tspan 14.282 - sodipodi:role="line" 14.283 - id="tspan2875" 14.284 - x="394.81305" 14.285 - y="446.23904" 14.286 - style="font-family:Courier"><tspan 14.287 - id="tspan2877" 14.288 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 14.289 - <rect 14.290 - 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" 14.291 - id="rect2879" 14.292 - width="94.285713" 14.293 - height="20.714285" 14.294 - x="370.71414" 14.295 - y="385.74289" /> 14.296 - <text 14.297 - xml:space="preserve" 14.298 - 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" 14.299 - x="394.81305" 14.300 - y="399.36404" 14.301 - id="text2881"><tspan 14.302 - sodipodi:role="line" 14.303 - id="tspan2883" 14.304 - x="394.81305" 14.305 - y="399.36404" 14.306 - style="font-family:Courier"><tspan 14.307 - style="font-weight:bold" 14.308 - id="tspan2885">2</tspan>: REV2</tspan></text> 14.309 - <rect 14.310 - 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" 14.311 - id="rect2887" 14.312 - width="94.285713" 14.313 - height="20.714285" 14.314 - x="370.71414" 14.315 - y="338.86792" /> 14.316 - <text 14.317 - xml:space="preserve" 14.318 - 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" 14.319 - x="394.81305" 14.320 - y="352.48907" 14.321 - id="text2889"><tspan 14.322 - sodipodi:role="line" 14.323 - id="tspan2891" 14.324 - x="394.81305" 14.325 - y="352.48907" 14.326 - style="font-family:Courier"><tspan 14.327 - style="font-weight:bold" 14.328 - id="tspan2893">3</tspan>: REV3</tspan></text> 14.329 - <rect 14.330 - 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" 14.331 - id="rect2895" 14.332 - width="94.285713" 14.333 - height="20.714285" 14.334 - x="370.71414" 14.335 - y="291.99289" /> 14.336 - <text 14.337 - xml:space="preserve" 14.338 - 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" 14.339 - x="394.81305" 14.340 - y="305.61404" 14.341 - id="text2897"><tspan 14.342 - sodipodi:role="line" 14.343 - id="tspan2899" 14.344 - x="394.81305" 14.345 - y="305.61404" 14.346 - style="font-family:Courier"><tspan 14.347 - style="font-weight:bold" 14.348 - id="tspan2901">4</tspan>: REV4</tspan></text> 14.349 - <path 14.350 - 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" 14.351 - d="M 417.85701,478.4929 L 417.85701,454.33218" 14.352 - id="path2903" 14.353 - inkscape:connector-type="polyline" /> 14.354 - <path 14.355 - 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" 14.356 - d="M 417.85701,431.6179 L 417.85701,407.45718" 14.357 - id="path2905" 14.358 - inkscape:connector-type="polyline" /> 14.359 - <path 14.360 - 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" 14.361 - d="M 417.85701,384.7429 L 417.85701,360.58221" 14.362 - id="path2907" 14.363 - inkscape:connector-type="polyline" /> 14.364 - <path 14.365 - 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" 14.366 - d="M 417.85701,337.86793 L 417.85701,313.70718" 14.367 - id="path2909" 14.368 - inkscape:connector-type="polyline" /> 14.369 - <rect 14.370 - 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" 14.371 - id="rect2911" 14.372 - width="94.285995" 14.373 - height="20.714283" 14.374 - x="370.71414" 14.375 - y="245.17511" /> 14.376 - <text 14.377 - xml:space="preserve" 14.378 - 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" 14.379 - x="394.81274" 14.380 - y="258.79678" 14.381 - id="text2913" 14.382 - transform="scale(1.000002,0.999998)"><tspan 14.383 - sodipodi:role="line" 14.384 - id="tspan2915" 14.385 - x="394.81274" 14.386 - y="258.79678" 14.387 - style="font-family:Courier"><tspan 14.388 - style="font-weight:bold" 14.389 - id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text> 14.390 - <path 14.391 - 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" 14.392 - d="M 417.85715,291.05004 L 417.85715,266.88929" 14.393 - id="path2919" 14.394 - inkscape:connector-type="polyline" /> 14.395 - <text 14.396 - xml:space="preserve" 14.397 - 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" 14.398 - x="369.61453" 14.399 - y="232.25546" 14.400 - id="text2925"><tspan 14.401 - sodipodi:role="line" 14.402 - id="tspan2927" 14.403 - x="369.61453" 14.404 - y="232.25546">my-new-hello</tspan></text> 14.405 - <text 14.406 - xml:space="preserve" 14.407 - 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" 14.408 - x="300.54352" 14.409 - y="252.12723" 14.410 - id="text2933"><tspan 14.411 - sodipodi:role="line" 14.412 - id="tspan2935" 14.413 - x="300.54352" 14.414 - y="252.12723" 14.415 - style="text-align:center;text-anchor:middle">newest changes</tspan><tspan 14.416 - sodipodi:role="line" 14.417 - x="300.54352" 14.418 - y="267.12723" 14.419 - style="text-align:center;text-anchor:middle" 14.420 - id="tspan3132">differ</tspan></text> 14.421 - <text 14.422 - xml:space="preserve" 14.423 - style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 14.424 - x="262.15436" 14.425 - y="398.37112" 14.426 - id="text2929"><tspan 14.427 - sodipodi:role="line" 14.428 - x="262.15436" 14.429 - y="398.37112" 14.430 - id="tspan3013" 14.431 - style="text-align:start;text-anchor:start">common history</tspan></text> 14.432 - <g 14.433 - id="g3107" 14.434 - transform="translate(0,0.855744)"> 14.435 - <path 14.436 - id="path3101" 14.437 - d="M 300.35713,381.29075 L 300.35713,304.50504" 14.438 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" /> 14.439 - <path 14.440 - id="path3105" 14.441 - d="M 291.07142,301.64789 L 309.28571,301.64789" 14.442 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 14.443 - </g> 14.444 - <path 14.445 - style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 14.446 - d="M 300.53571,486.38926 L 300.53571,409.60355" 14.447 - id="path3113" /> 14.448 - <path 14.449 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 14.450 - d="M 291.25,488.49641 L 309.46429,488.49641" 14.451 - id="path3115" /> 14.452 - <text 14.453 - xml:space="preserve" 14.454 - 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" 14.455 - x="480.71429" 14.456 - y="250.91507" 14.457 - id="text1949"><tspan 14.458 - sodipodi:role="line" 14.459 - id="tspan1951" 14.460 - x="480.71429" 14.461 - y="250.91507" 14.462 - style="text-align:start;text-anchor:start">head revision</tspan><tspan 14.463 - sodipodi:role="line" 14.464 - x="480.71429" 14.465 - y="265.91507" 14.466 - id="tspan1953" 14.467 - style="text-align:start;text-anchor:start">(has no children)</tspan></text> 14.468 - </g> 14.469 -</svg>
15.1 --- a/en/figs/undo-manual-merge.dot Thu Mar 12 15:53:01 2009 +0800 15.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 15.3 @@ -1,8 +0,0 @@ 15.4 -digraph undo_manual { 15.5 - "first change" -> "second change"; 15.6 - "second change" -> "third change"; 15.7 - backout [label="back out\nsecond change", shape=box]; 15.8 - "second change" -> backout; 15.9 - "third change" -> "manual\nmerge"; 15.10 - backout -> "manual\nmerge"; 15.11 -}
16.1 --- a/en/figs/undo-manual.dot Thu Mar 12 15:53:01 2009 +0800 16.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 16.3 @@ -1,6 +0,0 @@ 16.4 -digraph undo_manual { 16.5 - "first change" -> "second change"; 16.6 - "second change" -> "third change"; 16.7 - backout [label="back out\nsecond change", shape=box]; 16.8 - "second change" -> backout; 16.9 -}
17.1 --- a/en/figs/undo-non-tip.dot Thu Mar 12 15:53:01 2009 +0800 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,9 +0,0 @@ 17.4 -digraph undo_non_tip { 17.5 - "first change" -> "second change"; 17.6 - "second change" -> "third change"; 17.7 - backout [label="back out\nsecond change", shape=box]; 17.8 - "second change" -> backout; 17.9 - merge [label="automated\nmerge", shape=box]; 17.10 - "third change" -> merge; 17.11 - backout -> merge; 17.12 -}
18.1 --- a/en/figs/undo-simple.dot Thu Mar 12 15:53:01 2009 +0800 18.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 18.3 @@ -1,4 +0,0 @@ 18.4 -digraph undo_simple { 18.5 - "first change" -> "second change"; 18.6 - "second change" -> "back out\nsecond change"; 18.7 -}
19.1 --- a/en/figs/wdir-after-commit.svg Thu Mar 12 15:53:01 2009 +0800 19.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 19.3 @@ -1,394 +0,0 @@ 19.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 19.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 19.6 -<svg 19.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 19.8 - xmlns:cc="http://web.resource.org/cc/" 19.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 19.10 - xmlns:svg="http://www.w3.org/2000/svg" 19.11 - xmlns="http://www.w3.org/2000/svg" 19.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 19.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 19.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 19.15 - width="744.09448819" 19.16 - height="1052.3622047" 19.17 - id="svg5971" 19.18 - sodipodi:version="0.32" 19.19 - inkscape:version="0.44.1" 19.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 19.21 - sodipodi:docname="wdir-after-commit.svg"> 19.22 - <defs 19.23 - id="defs5973"> 19.24 - <linearGradient 19.25 - inkscape:collect="always" 19.26 - xlink:href="#linearGradient6049" 19.27 - id="linearGradient6445" 19.28 - gradientUnits="userSpaceOnUse" 19.29 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 19.30 - x1="333.91171" 19.31 - y1="488.79077" 19.32 - x2="508.94543" 19.33 - y2="263.79077" /> 19.34 - <marker 19.35 - inkscape:stockid="Arrow1Mstart" 19.36 - orient="auto" 19.37 - refY="0.0" 19.38 - refX="0.0" 19.39 - id="Arrow1Mstart" 19.40 - style="overflow:visible"> 19.41 - <path 19.42 - id="path4855" 19.43 - 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 " 19.44 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 19.45 - transform="scale(0.4) translate(10,0)" /> 19.46 - </marker> 19.47 - <linearGradient 19.48 - id="linearGradient6049"> 19.49 - <stop 19.50 - style="stop-color:#686868;stop-opacity:1;" 19.51 - offset="0" 19.52 - id="stop6051" /> 19.53 - <stop 19.54 - style="stop-color:#f0f0f0;stop-opacity:1;" 19.55 - offset="1" 19.56 - id="stop6053" /> 19.57 - </linearGradient> 19.58 - <marker 19.59 - inkscape:stockid="Arrow1Mend" 19.60 - orient="auto" 19.61 - refY="0.0" 19.62 - refX="0.0" 19.63 - id="Arrow1Mend" 19.64 - style="overflow:visible;"> 19.65 - <path 19.66 - id="path4852" 19.67 - 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 " 19.68 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 19.69 - transform="scale(0.4) rotate(180) translate(10,0)" /> 19.70 - </marker> 19.71 - <linearGradient 19.72 - inkscape:collect="always" 19.73 - xlink:href="#linearGradient6049" 19.74 - id="linearGradient6083" 19.75 - gradientUnits="userSpaceOnUse" 19.76 - gradientTransform="translate(-240.0462,-8.633237e-6)" 19.77 - x1="333.91171" 19.78 - y1="488.79077" 19.79 - x2="508.94543" 19.80 - y2="263.79077" /> 19.81 - <linearGradient 19.82 - inkscape:collect="always" 19.83 - xlink:href="#linearGradient6049" 19.84 - id="linearGradient6142" 19.85 - gradientUnits="userSpaceOnUse" 19.86 - gradientTransform="translate(-42.00893,-30.49544)" 19.87 - x1="333.91171" 19.88 - y1="488.79077" 19.89 - x2="508.94543" 19.90 - y2="263.79077" /> 19.91 - <linearGradient 19.92 - inkscape:collect="always" 19.93 - xlink:href="#linearGradient6049" 19.94 - id="linearGradient6193" 19.95 - gradientUnits="userSpaceOnUse" 19.96 - gradientTransform="translate(-240.0462,-8.633237e-6)" 19.97 - x1="333.91171" 19.98 - y1="488.79077" 19.99 - x2="508.94543" 19.100 - y2="263.79077" /> 19.101 - <linearGradient 19.102 - inkscape:collect="always" 19.103 - xlink:href="#linearGradient6049" 19.104 - id="linearGradient6216" 19.105 - gradientUnits="userSpaceOnUse" 19.106 - gradientTransform="translate(-6.0462,-0.664361)" 19.107 - x1="333.91171" 19.108 - y1="488.79077" 19.109 - x2="508.94543" 19.110 - y2="263.79077" /> 19.111 - <linearGradient 19.112 - inkscape:collect="always" 19.113 - xlink:href="#linearGradient6049" 19.114 - id="linearGradient6232" 19.115 - gradientUnits="userSpaceOnUse" 19.116 - gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 19.117 - x1="333.91171" 19.118 - y1="488.79077" 19.119 - x2="508.94543" 19.120 - y2="263.79077" /> 19.121 - <linearGradient 19.122 - inkscape:collect="always" 19.123 - xlink:href="#linearGradient6049" 19.124 - id="linearGradient6772" 19.125 - gradientUnits="userSpaceOnUse" 19.126 - gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 19.127 - x1="333.91171" 19.128 - y1="488.79077" 19.129 - x2="508.94543" 19.130 - y2="263.79077" /> 19.131 - </defs> 19.132 - <sodipodi:namedview 19.133 - id="base" 19.134 - pagecolor="#ffffff" 19.135 - bordercolor="#666666" 19.136 - borderopacity="1.0" 19.137 - gridtolerance="10000" 19.138 - guidetolerance="10" 19.139 - objecttolerance="10" 19.140 - inkscape:pageopacity="0.0" 19.141 - inkscape:pageshadow="2" 19.142 - inkscape:zoom="0.90509668" 19.143 - inkscape:cx="390.0539" 19.144 - inkscape:cy="690.49342" 19.145 - inkscape:document-units="px" 19.146 - inkscape:current-layer="layer1" 19.147 - showguides="true" 19.148 - inkscape:guide-bbox="true" 19.149 - inkscape:window-width="906" 19.150 - inkscape:window-height="620" 19.151 - inkscape:window-x="0" 19.152 - inkscape:window-y="25"> 19.153 - <sodipodi:guide 19.154 - orientation="vertical" 19.155 - position="-1.4285714" 19.156 - id="guide6022" /> 19.157 - </sodipodi:namedview> 19.158 - <metadata 19.159 - id="metadata5976"> 19.160 - <rdf:RDF> 19.161 - <cc:Work 19.162 - rdf:about=""> 19.163 - <dc:format>image/svg+xml</dc:format> 19.164 - <dc:type 19.165 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 19.166 - </cc:Work> 19.167 - </rdf:RDF> 19.168 - </metadata> 19.169 - <g 19.170 - inkscape:label="Layer 1" 19.171 - inkscape:groupmode="layer" 19.172 - id="layer1"> 19.173 - <rect 19.174 - y="245.98355" 19.175 - x="328.23956" 19.176 - height="258.57144" 19.177 - width="174.28572" 19.178 - id="rect6047" 19.179 - 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" /> 19.180 - <g 19.181 - id="g6261" 19.182 - transform="translate(234,0)"> 19.183 - <rect 19.184 - y="258.7149" 19.185 - x="114.11369" 19.186 - height="44.537449" 19.187 - width="134.53746" 19.188 - id="rect5983" 19.189 - 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" /> 19.190 - <text 19.191 - id="text5985" 19.192 - y="284.47562" 19.193 - x="138.7962" 19.194 - 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" 19.195 - xml:space="preserve"><tspan 19.196 - style="font-family:Courier" 19.197 - y="284.47562" 19.198 - x="138.7962" 19.199 - id="tspan5987" 19.200 - sodipodi:role="line">dfbbb33f3fa3</tspan></text> 19.201 - </g> 19.202 - <rect 19.203 - 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" 19.204 - id="rect5996" 19.205 - width="134.53746" 19.206 - height="44.537449" 19.207 - x="348.11371" 19.208 - y="320.38159" /> 19.209 - <text 19.210 - xml:space="preserve" 19.211 - 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" 19.212 - x="372.7962" 19.213 - y="346.1423" 19.214 - id="text5998"><tspan 19.215 - sodipodi:role="line" 19.216 - id="tspan6000" 19.217 - x="372.7962" 19.218 - y="346.1423" 19.219 - style="font-family:Courier">e7639888bb2f</tspan></text> 19.220 - <rect 19.221 - 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" 19.222 - id="rect6004" 19.223 - width="134.53746" 19.224 - height="44.537449" 19.225 - x="348.11371" 19.226 - y="382.04825" /> 19.227 - <text 19.228 - xml:space="preserve" 19.229 - 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" 19.230 - x="370.65421" 19.231 - y="407.80896" 19.232 - id="text6006"><tspan 19.233 - sodipodi:role="line" 19.234 - id="tspan6008" 19.235 - x="370.65421" 19.236 - y="407.80896" 19.237 - style="font-family:Courier">7b064d8bac5e</tspan></text> 19.238 - <path 19.239 - inkscape:connector-type="polyline" 19.240 - id="path6018" 19.241 - d="M 415.38242,303.62646 L 415.38242,320.00744" 19.242 - 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" /> 19.243 - <path 19.244 - inkscape:connection-end="#rect6004" 19.245 - inkscape:connector-type="polyline" 19.246 - id="path6020" 19.247 - d="M 415.38242,365.29315 L 415.38243,381.67412" 19.248 - 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" /> 19.249 - <rect 19.250 - 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" 19.251 - id="rect6039" 19.252 - width="134.53746" 19.253 - height="44.537449" 19.254 - x="348.11359" 19.255 - y="443.71487" /> 19.256 - <text 19.257 - xml:space="preserve" 19.258 - 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" 19.259 - x="372.79706" 19.260 - y="469.47556" 19.261 - id="text6041"><tspan 19.262 - sodipodi:role="line" 19.263 - id="tspan6043" 19.264 - x="372.79706" 19.265 - y="469.47556" 19.266 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 19.267 - <path 19.268 - inkscape:connection-end="#rect6039" 19.269 - inkscape:connector-type="polyline" 19.270 - id="path6045" 19.271 - d="M 415.38238,426.95981 L 415.38235,443.34087" 19.272 - 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" /> 19.273 - <text 19.274 - xml:space="preserve" 19.275 - 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" 19.276 - x="327.66046" 19.277 - y="231.36218" 19.278 - id="text6102"><tspan 19.279 - sodipodi:role="line" 19.280 - id="tspan6104" 19.281 - x="327.66046" 19.282 - y="231.36218">History in repository</tspan></text> 19.283 - <rect 19.284 - y="245.94225" 19.285 - x="557.28418" 19.286 - height="204.51619" 19.287 - width="174.36833" 19.288 - id="rect6140" 19.289 - 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" /> 19.290 - <g 19.291 - id="g6130" 19.292 - transform="translate(262.3254,24.38544)"> 19.293 - <rect 19.294 - 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" 19.295 - id="rect6106" 19.296 - width="134.53746" 19.297 - height="44.537449" 19.298 - x="314.87415" 19.299 - y="257.95059" /> 19.300 - <text 19.301 - xml:space="preserve" 19.302 - 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" 19.303 - x="339.55664" 19.304 - y="283.7113" 19.305 - id="text6108"><tspan 19.306 - sodipodi:role="line" 19.307 - id="tspan6110" 19.308 - x="339.55664" 19.309 - y="283.7113" 19.310 - style="font-family:Courier">dfbbb33f3fa3</tspan></text> 19.311 - </g> 19.312 - <g 19.313 - id="g6135" 19.314 - transform="translate(263.0396,49.83106)"> 19.315 - <rect 19.316 - inkscape:transform-center-y="102.85714" 19.317 - inkscape:transform-center-x="129.28571" 19.318 - 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" 19.319 - id="rect6112" 19.320 - width="134.53746" 19.321 - height="44.537449" 19.322 - x="314.15985" 19.323 - y="326.52203" /> 19.324 - <text 19.325 - inkscape:transform-center-y="102.7311" 19.326 - inkscape:transform-center-x="128.69672" 19.327 - xml:space="preserve" 19.328 - 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" 19.329 - x="338.84335" 19.330 - y="352.28271" 19.331 - id="text6114"><tspan 19.332 - sodipodi:role="line" 19.333 - id="tspan6116" 19.334 - x="338.84335" 19.335 - y="352.28271" 19.336 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 19.337 - </g> 19.338 - <text 19.339 - xml:space="preserve" 19.340 - 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" 19.341 - x="576.63208" 19.342 - y="270.479" 19.343 - id="text6118"><tspan 19.344 - sodipodi:role="line" 19.345 - id="tspan6120" 19.346 - x="576.63208" 19.347 - y="270.479">First parent</tspan></text> 19.348 - <text 19.349 - xml:space="preserve" 19.350 - 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" 19.351 - x="576.07544" 19.352 - y="364.49615" 19.353 - id="text6122"><tspan 19.354 - sodipodi:role="line" 19.355 - id="tspan6124" 19.356 - x="576.07544" 19.357 - y="364.49615">Second parent</tspan></text> 19.358 - <text 19.359 - xml:space="preserve" 19.360 - 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" 19.361 - x="556.61743" 19.362 - y="231.36218" 19.363 - id="text6195"><tspan 19.364 - sodipodi:role="line" 19.365 - id="tspan6197" 19.366 - x="556.61743" 19.367 - y="231.36218">Parents of working directory</tspan></text> 19.368 - <path 19.369 - 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" 19.370 - d="M 576.82542,297.63008 L 483.02528,287.95831" 19.371 - id="path6266" 19.372 - inkscape:connector-type="polyline" 19.373 - inkscape:connection-start="#g6130" 19.374 - inkscape:connection-end="#g6261" /> 19.375 - <path 19.376 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 19.377 - d="M 665.12232,418.17579 L 665.12232,418.17579" 19.378 - id="path6270" 19.379 - inkscape:connector-type="polyline" /> 19.380 - <text 19.381 - xml:space="preserve" 19.382 - 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" 19.383 - x="316.86407" 19.384 - y="275.6496" 19.385 - id="text6573"><tspan 19.386 - sodipodi:role="line" 19.387 - id="tspan6575" 19.388 - x="316.86407" 19.389 - y="275.6496" 19.390 - style="text-align:end;text-anchor:end">New</tspan><tspan 19.391 - sodipodi:role="line" 19.392 - x="316.86407" 19.393 - y="290.6496" 19.394 - id="tspan6577" 19.395 - style="text-align:end;text-anchor:end">changeset</tspan></text> 19.396 - </g> 19.397 -</svg>
20.1 --- a/en/figs/wdir-branch.svg Thu Mar 12 15:53:01 2009 +0800 20.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 20.3 @@ -1,418 +0,0 @@ 20.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 20.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 20.6 -<svg 20.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 20.8 - xmlns:cc="http://web.resource.org/cc/" 20.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 20.10 - xmlns:svg="http://www.w3.org/2000/svg" 20.11 - xmlns="http://www.w3.org/2000/svg" 20.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 20.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 20.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 20.15 - width="744.09448819" 20.16 - height="1052.3622047" 20.17 - id="svg5971" 20.18 - sodipodi:version="0.32" 20.19 - inkscape:version="0.44.1" 20.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 20.21 - sodipodi:docname="wdir-branch.svg"> 20.22 - <defs 20.23 - id="defs5973"> 20.24 - <marker 20.25 - inkscape:stockid="Arrow1Mstart" 20.26 - orient="auto" 20.27 - refY="0.0" 20.28 - refX="0.0" 20.29 - id="Arrow1Mstart" 20.30 - style="overflow:visible"> 20.31 - <path 20.32 - id="path4855" 20.33 - 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 " 20.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 20.35 - transform="scale(0.4) translate(10,0)" /> 20.36 - </marker> 20.37 - <linearGradient 20.38 - id="linearGradient6049"> 20.39 - <stop 20.40 - style="stop-color:#686868;stop-opacity:1;" 20.41 - offset="0" 20.42 - id="stop6051" /> 20.43 - <stop 20.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 20.45 - offset="1" 20.46 - id="stop6053" /> 20.47 - </linearGradient> 20.48 - <marker 20.49 - inkscape:stockid="Arrow1Mend" 20.50 - orient="auto" 20.51 - refY="0.0" 20.52 - refX="0.0" 20.53 - id="Arrow1Mend" 20.54 - style="overflow:visible;"> 20.55 - <path 20.56 - id="path4852" 20.57 - 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 " 20.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 20.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 20.60 - </marker> 20.61 - <linearGradient 20.62 - inkscape:collect="always" 20.63 - xlink:href="#linearGradient6049" 20.64 - id="linearGradient6083" 20.65 - gradientUnits="userSpaceOnUse" 20.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 20.67 - x1="333.91171" 20.68 - y1="488.79077" 20.69 - x2="508.94543" 20.70 - y2="263.79077" /> 20.71 - <linearGradient 20.72 - inkscape:collect="always" 20.73 - xlink:href="#linearGradient6049" 20.74 - id="linearGradient6142" 20.75 - gradientUnits="userSpaceOnUse" 20.76 - gradientTransform="translate(-42.00893,-30.49544)" 20.77 - x1="333.91171" 20.78 - y1="488.79077" 20.79 - x2="508.94543" 20.80 - y2="263.79077" /> 20.81 - <linearGradient 20.82 - inkscape:collect="always" 20.83 - xlink:href="#linearGradient6049" 20.84 - id="linearGradient6193" 20.85 - gradientUnits="userSpaceOnUse" 20.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 20.87 - x1="333.91171" 20.88 - y1="488.79077" 20.89 - x2="508.94543" 20.90 - y2="263.79077" /> 20.91 - <linearGradient 20.92 - inkscape:collect="always" 20.93 - xlink:href="#linearGradient6049" 20.94 - id="linearGradient6216" 20.95 - gradientUnits="userSpaceOnUse" 20.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 20.97 - x1="333.91171" 20.98 - y1="488.79077" 20.99 - x2="508.94543" 20.100 - y2="263.79077" /> 20.101 - <linearGradient 20.102 - inkscape:collect="always" 20.103 - xlink:href="#linearGradient6049" 20.104 - id="linearGradient6232" 20.105 - gradientUnits="userSpaceOnUse" 20.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 20.107 - x1="333.91171" 20.108 - y1="488.79077" 20.109 - x2="508.94543" 20.110 - y2="263.79077" /> 20.111 - <linearGradient 20.112 - inkscape:collect="always" 20.113 - xlink:href="#linearGradient6049" 20.114 - id="linearGradient6445" 20.115 - gradientUnits="userSpaceOnUse" 20.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 20.117 - x1="333.91171" 20.118 - y1="488.79077" 20.119 - x2="508.94543" 20.120 - y2="263.79077" /> 20.121 - <linearGradient 20.122 - inkscape:collect="always" 20.123 - xlink:href="#linearGradient6049" 20.124 - id="linearGradient6974" 20.125 - gradientUnits="userSpaceOnUse" 20.126 - gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 20.127 - x1="333.91171" 20.128 - y1="488.79077" 20.129 - x2="508.94543" 20.130 - y2="263.79077" /> 20.131 - <linearGradient 20.132 - inkscape:collect="always" 20.133 - xlink:href="#linearGradient6049" 20.134 - id="linearGradient6996" 20.135 - gradientUnits="userSpaceOnUse" 20.136 - gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 20.137 - x1="333.91171" 20.138 - y1="488.79077" 20.139 - x2="508.94543" 20.140 - y2="263.79077" /> 20.141 - </defs> 20.142 - <sodipodi:namedview 20.143 - id="base" 20.144 - pagecolor="#ffffff" 20.145 - bordercolor="#666666" 20.146 - borderopacity="1.0" 20.147 - gridtolerance="10000" 20.148 - guidetolerance="10" 20.149 - objecttolerance="10" 20.150 - inkscape:pageopacity="0.0" 20.151 - inkscape:pageshadow="2" 20.152 - inkscape:zoom="0.90509668" 20.153 - inkscape:cx="345.85973" 20.154 - inkscape:cy="690.49342" 20.155 - inkscape:document-units="px" 20.156 - inkscape:current-layer="layer1" 20.157 - showguides="true" 20.158 - inkscape:guide-bbox="true" 20.159 - inkscape:window-width="906" 20.160 - inkscape:window-height="620" 20.161 - inkscape:window-x="0" 20.162 - inkscape:window-y="25"> 20.163 - <sodipodi:guide 20.164 - orientation="vertical" 20.165 - position="-1.4285714" 20.166 - id="guide6022" /> 20.167 - </sodipodi:namedview> 20.168 - <metadata 20.169 - id="metadata5976"> 20.170 - <rdf:RDF> 20.171 - <cc:Work 20.172 - rdf:about=""> 20.173 - <dc:format>image/svg+xml</dc:format> 20.174 - <dc:type 20.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 20.176 - </cc:Work> 20.177 - </rdf:RDF> 20.178 - </metadata> 20.179 - <g 20.180 - inkscape:label="Layer 1" 20.181 - inkscape:groupmode="layer" 20.182 - id="layer1"> 20.183 - <rect 20.184 - y="246.06918" 20.185 - x="64.325172" 20.186 - height="204.26233" 20.187 - width="333.2135" 20.188 - id="rect6047" 20.189 - style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 20.190 - <g 20.191 - id="g1935"> 20.192 - <rect 20.193 - y="266.24374" 20.194 - x="84.113708" 20.195 - height="44.537449" 20.196 - width="134.53746" 20.197 - id="rect5996" 20.198 - 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" /> 20.199 - <text 20.200 - id="text5998" 20.201 - y="292.00446" 20.202 - x="108.7962" 20.203 - 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" 20.204 - xml:space="preserve"><tspan 20.205 - style="font-family:Courier" 20.206 - y="292.00446" 20.207 - x="108.7962" 20.208 - id="tspan6000" 20.209 - sodipodi:role="line">e7639888bb2f</tspan></text> 20.210 - </g> 20.211 - <g 20.212 - id="g6976" 20.213 - transform="translate(70,0)"> 20.214 - <rect 20.215 - y="327.9104" 20.216 - x="40.113693" 20.217 - height="44.537449" 20.218 - width="134.53746" 20.219 - id="rect6004" 20.220 - 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" /> 20.221 - <text 20.222 - id="text6006" 20.223 - y="353.67111" 20.224 - x="62.654205" 20.225 - 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" 20.226 - xml:space="preserve"><tspan 20.227 - style="font-family:Courier" 20.228 - y="353.67111" 20.229 - x="62.654205" 20.230 - id="tspan6008" 20.231 - sodipodi:role="line">7b064d8bac5e</tspan></text> 20.232 - </g> 20.233 - <path 20.234 - inkscape:connector-type="polyline" 20.235 - id="path6020" 20.236 - d="M 160.92915,311.15532 L 167.83571,327.53627" 20.237 - 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;display:inline" 20.238 - inkscape:connection-end="#g6976" 20.239 - inkscape:connection-start="#g1935" /> 20.240 - <rect 20.241 - 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" 20.242 - id="rect6039" 20.243 - width="134.53746" 20.244 - height="44.537449" 20.245 - x="110.11359" 20.246 - y="389.57703" /> 20.247 - <text 20.248 - xml:space="preserve" 20.249 - 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" 20.250 - x="134.79706" 20.251 - y="415.33771" 20.252 - id="text6041"><tspan 20.253 - sodipodi:role="line" 20.254 - id="tspan6043" 20.255 - x="134.79706" 20.256 - y="415.33771" 20.257 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 20.258 - <path 20.259 - inkscape:connection-end="#rect6039" 20.260 - inkscape:connector-type="polyline" 20.261 - id="path6045" 20.262 - d="M 177.38238,372.82195 L 177.38235,389.20303" 20.263 - 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" /> 20.264 - <rect 20.265 - y="245.94225" 20.266 - x="447.28412" 20.267 - height="204.51619" 20.268 - width="174.36833" 20.269 - id="rect6140" 20.270 - style="fill:url(#linearGradient6996);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" /> 20.271 - <g 20.272 - id="g6130" 20.273 - transform="translate(152.3254,24.38544)"> 20.274 - <rect 20.275 - 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" 20.276 - id="rect6106" 20.277 - width="134.53746" 20.278 - height="44.537449" 20.279 - x="314.87415" 20.280 - y="257.95059" /> 20.281 - <text 20.282 - xml:space="preserve" 20.283 - 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" 20.284 - x="339.55664" 20.285 - y="283.7113" 20.286 - id="text6108"><tspan 20.287 - sodipodi:role="line" 20.288 - id="tspan6110" 20.289 - x="339.55664" 20.290 - y="283.7113" 20.291 - style="font-family:Courier">ffb20e1701ea</tspan></text> 20.292 - </g> 20.293 - <g 20.294 - id="g6135" 20.295 - transform="translate(153.0396,49.83106)"> 20.296 - <rect 20.297 - inkscape:transform-center-y="102.85714" 20.298 - inkscape:transform-center-x="129.28571" 20.299 - 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" 20.300 - id="rect6112" 20.301 - width="134.53746" 20.302 - height="44.537449" 20.303 - x="314.15985" 20.304 - y="326.52203" /> 20.305 - <text 20.306 - inkscape:transform-center-y="102.7311" 20.307 - inkscape:transform-center-x="128.69672" 20.308 - xml:space="preserve" 20.309 - 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" 20.310 - x="338.84335" 20.311 - y="352.28271" 20.312 - id="text6114"><tspan 20.313 - sodipodi:role="line" 20.314 - id="tspan6116" 20.315 - x="338.84335" 20.316 - y="352.28271" 20.317 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 20.318 - </g> 20.319 - <text 20.320 - xml:space="preserve" 20.321 - 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" 20.322 - x="466.63208" 20.323 - y="270.479" 20.324 - id="text6118"><tspan 20.325 - sodipodi:role="line" 20.326 - id="tspan6120" 20.327 - x="466.63208" 20.328 - y="270.479">First parent</tspan></text> 20.329 - <text 20.330 - xml:space="preserve" 20.331 - 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" 20.332 - x="466.07544" 20.333 - y="364.49615" 20.334 - id="text6122"><tspan 20.335 - sodipodi:role="line" 20.336 - id="tspan6124" 20.337 - x="466.07544" 20.338 - y="364.49615">Second parent</tspan></text> 20.339 - <text 20.340 - xml:space="preserve" 20.341 - 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" 20.342 - x="446.61743" 20.343 - y="231.36218" 20.344 - id="text6195"><tspan 20.345 - sodipodi:role="line" 20.346 - id="tspan6197" 20.347 - x="446.61743" 20.348 - y="231.36218">Parents of working directory</tspan></text> 20.349 - <path 20.350 - 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;display:inline" 20.351 - d="M 466.82542,300.21999 L 377.00207,294.39744" 20.352 - id="path6266" 20.353 - inkscape:connector-type="polyline" 20.354 - inkscape:connection-start="#g6130" 20.355 - inkscape:connection-end="#rect1925" /> 20.356 - <path 20.357 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 20.358 - d="M 665.12232,418.17579 L 665.12232,418.17579" 20.359 - id="path6270" 20.360 - inkscape:connector-type="polyline" /> 20.361 - <g 20.362 - id="g2845"> 20.363 - <rect 20.364 - y="266.24374" 20.365 - x="242.09048" 20.366 - height="44.537449" 20.367 - width="134.53746" 20.368 - id="rect1925" 20.369 - style="fill:#9f9f9f;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" /> 20.370 - <text 20.371 - id="text1927" 20.372 - y="292.00446" 20.373 - x="266.77298" 20.374 - 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" 20.375 - xml:space="preserve"><tspan 20.376 - style="font-family:Courier" 20.377 - y="292.00446" 20.378 - x="266.77298" 20.379 - id="tspan1929" 20.380 - sodipodi:role="line">ffb20e1701ea</tspan></text> 20.381 - </g> 20.382 - <path 20.383 - inkscape:connector-type="polyline" 20.384 - id="path1933" 20.385 - d="M 260.89978,311.15532 L 225.84185,327.53627" 20.386 - 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;display:inline" 20.387 - inkscape:connection-end="#g6976" /> 20.388 - <text 20.389 - xml:space="preserve" 20.390 - 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" 20.391 - x="109.45568" 20.392 - y="231.4554" 20.393 - id="text2837"><tspan 20.394 - sodipodi:role="line" 20.395 - id="tspan2839" 20.396 - x="109.45568" 20.397 - y="231.4554">Pre-existing head</tspan></text> 20.398 - <text 20.399 - xml:space="preserve" 20.400 - 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" 20.401 - x="237.54184" 20.402 - y="231.4554" 20.403 - id="text2841"><tspan 20.404 - sodipodi:role="line" 20.405 - id="tspan2843" 20.406 - x="237.54184" 20.407 - y="231.4554">Newly created head (and tip)</tspan></text> 20.408 - <path 20.409 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 20.410 - d="M 148.05048,235.87482 L 149.94915,265.86962" 20.411 - id="path2850" 20.412 - inkscape:connector-type="polyline" 20.413 - inkscape:connection-end="#g1935" /> 20.414 - <path 20.415 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 20.416 - d="M 303.83495,238.08453 L 306.87874,265.86962" 20.417 - id="path2852" 20.418 - inkscape:connector-type="polyline" 20.419 - inkscape:connection-end="#g2845" /> 20.420 - </g> 20.421 -</svg>
21.1 --- a/en/figs/wdir-merge.svg Thu Mar 12 15:53:01 2009 +0800 21.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 21.3 @@ -1,425 +0,0 @@ 21.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 21.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 21.6 -<svg 21.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 21.8 - xmlns:cc="http://web.resource.org/cc/" 21.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 21.10 - xmlns:svg="http://www.w3.org/2000/svg" 21.11 - xmlns="http://www.w3.org/2000/svg" 21.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 21.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 21.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 21.15 - width="744.09448819" 21.16 - height="1052.3622047" 21.17 - id="svg5971" 21.18 - sodipodi:version="0.32" 21.19 - inkscape:version="0.44.1" 21.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 21.21 - sodipodi:docname="wdir-merge.svg"> 21.22 - <defs 21.23 - id="defs5973"> 21.24 - <marker 21.25 - inkscape:stockid="Arrow1Mstart" 21.26 - orient="auto" 21.27 - refY="0.0" 21.28 - refX="0.0" 21.29 - id="Arrow1Mstart" 21.30 - style="overflow:visible"> 21.31 - <path 21.32 - id="path4855" 21.33 - 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 " 21.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 21.35 - transform="scale(0.4) translate(10,0)" /> 21.36 - </marker> 21.37 - <linearGradient 21.38 - id="linearGradient6049"> 21.39 - <stop 21.40 - style="stop-color:#686868;stop-opacity:1;" 21.41 - offset="0" 21.42 - id="stop6051" /> 21.43 - <stop 21.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 21.45 - offset="1" 21.46 - id="stop6053" /> 21.47 - </linearGradient> 21.48 - <marker 21.49 - inkscape:stockid="Arrow1Mend" 21.50 - orient="auto" 21.51 - refY="0.0" 21.52 - refX="0.0" 21.53 - id="Arrow1Mend" 21.54 - style="overflow:visible;"> 21.55 - <path 21.56 - id="path4852" 21.57 - 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 " 21.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 21.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 21.60 - </marker> 21.61 - <linearGradient 21.62 - inkscape:collect="always" 21.63 - xlink:href="#linearGradient6049" 21.64 - id="linearGradient6083" 21.65 - gradientUnits="userSpaceOnUse" 21.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 21.67 - x1="333.91171" 21.68 - y1="488.79077" 21.69 - x2="508.94543" 21.70 - y2="263.79077" /> 21.71 - <linearGradient 21.72 - inkscape:collect="always" 21.73 - xlink:href="#linearGradient6049" 21.74 - id="linearGradient6142" 21.75 - gradientUnits="userSpaceOnUse" 21.76 - gradientTransform="translate(-42.00893,-30.49544)" 21.77 - x1="333.91171" 21.78 - y1="488.79077" 21.79 - x2="508.94543" 21.80 - y2="263.79077" /> 21.81 - <linearGradient 21.82 - inkscape:collect="always" 21.83 - xlink:href="#linearGradient6049" 21.84 - id="linearGradient6193" 21.85 - gradientUnits="userSpaceOnUse" 21.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 21.87 - x1="333.91171" 21.88 - y1="488.79077" 21.89 - x2="508.94543" 21.90 - y2="263.79077" /> 21.91 - <linearGradient 21.92 - inkscape:collect="always" 21.93 - xlink:href="#linearGradient6049" 21.94 - id="linearGradient6216" 21.95 - gradientUnits="userSpaceOnUse" 21.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 21.97 - x1="333.91171" 21.98 - y1="488.79077" 21.99 - x2="508.94543" 21.100 - y2="263.79077" /> 21.101 - <linearGradient 21.102 - inkscape:collect="always" 21.103 - xlink:href="#linearGradient6049" 21.104 - id="linearGradient6232" 21.105 - gradientUnits="userSpaceOnUse" 21.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 21.107 - x1="333.91171" 21.108 - y1="488.79077" 21.109 - x2="508.94543" 21.110 - y2="263.79077" /> 21.111 - <linearGradient 21.112 - inkscape:collect="always" 21.113 - xlink:href="#linearGradient6049" 21.114 - id="linearGradient6445" 21.115 - gradientUnits="userSpaceOnUse" 21.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 21.117 - x1="333.91171" 21.118 - y1="488.79077" 21.119 - x2="508.94543" 21.120 - y2="263.79077" /> 21.121 - <linearGradient 21.122 - inkscape:collect="always" 21.123 - xlink:href="#linearGradient6049" 21.124 - id="linearGradient6974" 21.125 - gradientUnits="userSpaceOnUse" 21.126 - gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 21.127 - x1="333.91171" 21.128 - y1="488.79077" 21.129 - x2="508.94543" 21.130 - y2="263.79077" /> 21.131 - <linearGradient 21.132 - inkscape:collect="always" 21.133 - xlink:href="#linearGradient6049" 21.134 - id="linearGradient6996" 21.135 - gradientUnits="userSpaceOnUse" 21.136 - gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 21.137 - x1="333.91171" 21.138 - y1="488.79077" 21.139 - x2="508.94543" 21.140 - y2="263.79077" /> 21.141 - </defs> 21.142 - <sodipodi:namedview 21.143 - id="base" 21.144 - pagecolor="#ffffff" 21.145 - bordercolor="#666666" 21.146 - borderopacity="1.0" 21.147 - gridtolerance="10000" 21.148 - guidetolerance="10" 21.149 - objecttolerance="10" 21.150 - inkscape:pageopacity="0.0" 21.151 - inkscape:pageshadow="2" 21.152 - inkscape:zoom="1.28" 21.153 - inkscape:cx="345.85973" 21.154 - inkscape:cy="690.49342" 21.155 - inkscape:document-units="px" 21.156 - inkscape:current-layer="layer1" 21.157 - showguides="true" 21.158 - inkscape:guide-bbox="true" 21.159 - inkscape:window-width="906" 21.160 - inkscape:window-height="620" 21.161 - inkscape:window-x="0" 21.162 - inkscape:window-y="25"> 21.163 - <sodipodi:guide 21.164 - orientation="vertical" 21.165 - position="-1.4285714" 21.166 - id="guide6022" /> 21.167 - </sodipodi:namedview> 21.168 - <metadata 21.169 - id="metadata5976"> 21.170 - <rdf:RDF> 21.171 - <cc:Work 21.172 - rdf:about=""> 21.173 - <dc:format>image/svg+xml</dc:format> 21.174 - <dc:type 21.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 21.176 - </cc:Work> 21.177 - </rdf:RDF> 21.178 - </metadata> 21.179 - <g 21.180 - inkscape:label="Layer 1" 21.181 - inkscape:groupmode="layer" 21.182 - id="layer1"> 21.183 - <rect 21.184 - y="246.06918" 21.185 - x="64.325172" 21.186 - height="204.26233" 21.187 - width="333.2135" 21.188 - id="rect6047" 21.189 - style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 21.190 - <g 21.191 - id="g6976" 21.192 - transform="translate(70,0)"> 21.193 - <rect 21.194 - y="327.9104" 21.195 - x="40.113693" 21.196 - height="44.537449" 21.197 - width="134.53746" 21.198 - id="rect6004" 21.199 - 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" /> 21.200 - <text 21.201 - id="text6006" 21.202 - y="353.67111" 21.203 - x="62.654205" 21.204 - 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" 21.205 - xml:space="preserve"><tspan 21.206 - style="font-family:Courier" 21.207 - y="353.67111" 21.208 - x="62.654205" 21.209 - id="tspan6008" 21.210 - sodipodi:role="line">7b064d8bac5e</tspan></text> 21.211 - </g> 21.212 - <path 21.213 - inkscape:connector-type="polyline" 21.214 - id="path6020" 21.215 - d="M 160.92915,311.15532 L 167.83571,327.53627" 21.216 - 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;display:inline" 21.217 - inkscape:connection-end="#g6976" 21.218 - inkscape:connection-start="#g1935" /> 21.219 - <rect 21.220 - 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" 21.221 - id="rect6039" 21.222 - width="134.53746" 21.223 - height="44.537449" 21.224 - x="110.11359" 21.225 - y="389.57703" /> 21.226 - <text 21.227 - xml:space="preserve" 21.228 - 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" 21.229 - x="134.79706" 21.230 - y="415.33771" 21.231 - id="text6041"><tspan 21.232 - sodipodi:role="line" 21.233 - id="tspan6043" 21.234 - x="134.79706" 21.235 - y="415.33771" 21.236 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 21.237 - <path 21.238 - inkscape:connection-end="#rect6039" 21.239 - inkscape:connector-type="polyline" 21.240 - id="path6045" 21.241 - d="M 177.38238,372.82195 L 177.38235,389.20303" 21.242 - 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" /> 21.243 - <rect 21.244 - y="245.94225" 21.245 - x="447.28412" 21.246 - height="204.51619" 21.247 - width="174.36833" 21.248 - id="rect6140" 21.249 - style="fill:url(#linearGradient6996);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" /> 21.250 - <g 21.251 - id="g6130" 21.252 - transform="translate(152.3254,24.38544)"> 21.253 - <rect 21.254 - 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" 21.255 - id="rect6106" 21.256 - width="134.53746" 21.257 - height="44.537449" 21.258 - x="314.87415" 21.259 - y="257.95059" /> 21.260 - <text 21.261 - xml:space="preserve" 21.262 - 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" 21.263 - x="339.55664" 21.264 - y="283.7113" 21.265 - id="text6108"><tspan 21.266 - sodipodi:role="line" 21.267 - id="tspan6110" 21.268 - x="339.55664" 21.269 - y="283.7113" 21.270 - style="font-family:Courier">ffb20e1701ea</tspan></text> 21.271 - </g> 21.272 - <g 21.273 - id="g6135" 21.274 - transform="translate(153.0396,49.83106)"> 21.275 - <rect 21.276 - inkscape:transform-center-y="102.85714" 21.277 - inkscape:transform-center-x="129.28571" 21.278 - style="fill:#d4d4d4;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" 21.279 - id="rect6112" 21.280 - width="134.53746" 21.281 - height="44.537449" 21.282 - x="314.15985" 21.283 - y="326.52203" /> 21.284 - <text 21.285 - inkscape:transform-center-y="102.7311" 21.286 - inkscape:transform-center-x="128.69672" 21.287 - xml:space="preserve" 21.288 - 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" 21.289 - x="338.84335" 21.290 - y="352.28271" 21.291 - id="text6114"><tspan 21.292 - sodipodi:role="line" 21.293 - id="tspan6116" 21.294 - x="338.84335" 21.295 - y="352.28271" 21.296 - style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 21.297 - </g> 21.298 - <text 21.299 - xml:space="preserve" 21.300 - 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" 21.301 - x="466.63208" 21.302 - y="270.479" 21.303 - id="text6118"><tspan 21.304 - sodipodi:role="line" 21.305 - id="tspan6120" 21.306 - x="466.63208" 21.307 - y="270.479">First parent (unchanged)</tspan></text> 21.308 - <text 21.309 - xml:space="preserve" 21.310 - 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" 21.311 - x="466.07544" 21.312 - y="364.49615" 21.313 - id="text6122"><tspan 21.314 - sodipodi:role="line" 21.315 - id="tspan6124" 21.316 - x="466.07544" 21.317 - y="364.49615">Second parent</tspan></text> 21.318 - <text 21.319 - xml:space="preserve" 21.320 - 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" 21.321 - x="446.61743" 21.322 - y="231.36218" 21.323 - id="text6195"><tspan 21.324 - sodipodi:role="line" 21.325 - id="tspan6197" 21.326 - x="446.61743" 21.327 - y="231.36218">Parents of working directory</tspan></text> 21.328 - <path 21.329 - 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;display:inline" 21.330 - d="M 466.82542,300.21999 L 377.00207,294.39744" 21.331 - id="path6266" 21.332 - inkscape:connector-type="polyline" 21.333 - inkscape:connection-start="#g6130" 21.334 - inkscape:connection-end="#rect1925" /> 21.335 - <path 21.336 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 21.337 - d="M 665.12232,418.17579 L 665.12232,418.17579" 21.338 - id="path6270" 21.339 - inkscape:connector-type="polyline" /> 21.340 - <g 21.341 - id="g2845"> 21.342 - <rect 21.343 - y="266.24374" 21.344 - x="242.09048" 21.345 - height="44.537449" 21.346 - width="134.53746" 21.347 - id="rect1925" 21.348 - style="fill:#9f9f9f;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" /> 21.349 - <text 21.350 - id="text1927" 21.351 - y="292.00446" 21.352 - x="266.77298" 21.353 - 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" 21.354 - xml:space="preserve"><tspan 21.355 - style="font-family:Courier" 21.356 - y="292.00446" 21.357 - x="266.77298" 21.358 - id="tspan1929" 21.359 - sodipodi:role="line">ffb20e1701ea</tspan></text> 21.360 - </g> 21.361 - <path 21.362 - inkscape:connector-type="polyline" 21.363 - id="path1933" 21.364 - d="M 260.89978,311.15532 L 225.84185,327.53627" 21.365 - 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;display:inline" 21.366 - inkscape:connection-end="#g6976" /> 21.367 - <text 21.368 - xml:space="preserve" 21.369 - 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" 21.370 - x="109.45568" 21.371 - y="231.4554" 21.372 - id="text2837"><tspan 21.373 - sodipodi:role="line" 21.374 - id="tspan2839" 21.375 - x="109.45568" 21.376 - y="231.4554">Pre-existing head</tspan></text> 21.377 - <text 21.378 - xml:space="preserve" 21.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" 21.380 - x="237.54184" 21.381 - y="231.4554" 21.382 - id="text2841"><tspan 21.383 - sodipodi:role="line" 21.384 - id="tspan2843" 21.385 - x="237.54184" 21.386 - y="231.4554">Newly created head (and tip)</tspan></text> 21.387 - <path 21.388 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 21.389 - d="M 148.05048,235.87482 L 149.94915,265.86962" 21.390 - id="path2850" 21.391 - inkscape:connector-type="polyline" 21.392 - inkscape:connection-end="#g1935" /> 21.393 - <path 21.394 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 21.395 - d="M 303.83495,238.08453 L 306.87874,265.86962" 21.396 - id="path2852" 21.397 - inkscape:connector-type="polyline" 21.398 - inkscape:connection-end="#g2845" /> 21.399 - <path 21.400 - 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;display:inline" 21.401 - d="M 466.82545,379.17944 L 219.0253,307.95488" 21.402 - id="path3016" 21.403 - inkscape:connector-type="polyline" 21.404 - inkscape:connection-start="#g6135" 21.405 - inkscape:connection-end="#g1935" /> 21.406 - <g 21.407 - id="g1935"> 21.408 - <rect 21.409 - y="266.24374" 21.410 - x="84.113708" 21.411 - height="44.537449" 21.412 - width="134.53746" 21.413 - id="rect5996" 21.414 - 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" /> 21.415 - <text 21.416 - id="text5998" 21.417 - y="292.00446" 21.418 - x="108.7962" 21.419 - 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" 21.420 - xml:space="preserve"><tspan 21.421 - style="font-family:Courier" 21.422 - y="292.00446" 21.423 - x="108.7962" 21.424 - id="tspan6000" 21.425 - sodipodi:role="line">e7639888bb2f</tspan></text> 21.426 - </g> 21.427 - </g> 21.428 -</svg>
22.1 --- a/en/figs/wdir-pre-branch.svg Thu Mar 12 15:53:01 2009 +0800 22.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 22.3 @@ -1,364 +0,0 @@ 22.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 22.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 22.6 -<svg 22.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 22.8 - xmlns:cc="http://web.resource.org/cc/" 22.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 22.10 - xmlns:svg="http://www.w3.org/2000/svg" 22.11 - xmlns="http://www.w3.org/2000/svg" 22.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 22.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 22.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 22.15 - width="744.09448819" 22.16 - height="1052.3622047" 22.17 - id="svg5971" 22.18 - sodipodi:version="0.32" 22.19 - inkscape:version="0.44.1" 22.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 22.21 - sodipodi:docname="wdir-branch.svg"> 22.22 - <defs 22.23 - id="defs5973"> 22.24 - <marker 22.25 - inkscape:stockid="Arrow1Mstart" 22.26 - orient="auto" 22.27 - refY="0.0" 22.28 - refX="0.0" 22.29 - id="Arrow1Mstart" 22.30 - style="overflow:visible"> 22.31 - <path 22.32 - id="path4855" 22.33 - 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 " 22.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 22.35 - transform="scale(0.4) translate(10,0)" /> 22.36 - </marker> 22.37 - <linearGradient 22.38 - id="linearGradient6049"> 22.39 - <stop 22.40 - style="stop-color:#686868;stop-opacity:1;" 22.41 - offset="0" 22.42 - id="stop6051" /> 22.43 - <stop 22.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 22.45 - offset="1" 22.46 - id="stop6053" /> 22.47 - </linearGradient> 22.48 - <marker 22.49 - inkscape:stockid="Arrow1Mend" 22.50 - orient="auto" 22.51 - refY="0.0" 22.52 - refX="0.0" 22.53 - id="Arrow1Mend" 22.54 - style="overflow:visible;"> 22.55 - <path 22.56 - id="path4852" 22.57 - 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 " 22.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 22.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 22.60 - </marker> 22.61 - <linearGradient 22.62 - inkscape:collect="always" 22.63 - xlink:href="#linearGradient6049" 22.64 - id="linearGradient6083" 22.65 - gradientUnits="userSpaceOnUse" 22.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 22.67 - x1="333.91171" 22.68 - y1="488.79077" 22.69 - x2="508.94543" 22.70 - y2="263.79077" /> 22.71 - <linearGradient 22.72 - inkscape:collect="always" 22.73 - xlink:href="#linearGradient6049" 22.74 - id="linearGradient6142" 22.75 - gradientUnits="userSpaceOnUse" 22.76 - gradientTransform="translate(-42.00893,-30.49544)" 22.77 - x1="333.91171" 22.78 - y1="488.79077" 22.79 - x2="508.94543" 22.80 - y2="263.79077" /> 22.81 - <linearGradient 22.82 - inkscape:collect="always" 22.83 - xlink:href="#linearGradient6049" 22.84 - id="linearGradient6193" 22.85 - gradientUnits="userSpaceOnUse" 22.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 22.87 - x1="333.91171" 22.88 - y1="488.79077" 22.89 - x2="508.94543" 22.90 - y2="263.79077" /> 22.91 - <linearGradient 22.92 - inkscape:collect="always" 22.93 - xlink:href="#linearGradient6049" 22.94 - id="linearGradient6216" 22.95 - gradientUnits="userSpaceOnUse" 22.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 22.97 - x1="333.91171" 22.98 - y1="488.79077" 22.99 - x2="508.94543" 22.100 - y2="263.79077" /> 22.101 - <linearGradient 22.102 - inkscape:collect="always" 22.103 - xlink:href="#linearGradient6049" 22.104 - id="linearGradient6232" 22.105 - gradientUnits="userSpaceOnUse" 22.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 22.107 - x1="333.91171" 22.108 - y1="488.79077" 22.109 - x2="508.94543" 22.110 - y2="263.79077" /> 22.111 - <linearGradient 22.112 - inkscape:collect="always" 22.113 - xlink:href="#linearGradient6049" 22.114 - id="linearGradient6445" 22.115 - gradientUnits="userSpaceOnUse" 22.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 22.117 - x1="333.91171" 22.118 - y1="488.79077" 22.119 - x2="508.94543" 22.120 - y2="263.79077" /> 22.121 - <linearGradient 22.122 - inkscape:collect="always" 22.123 - xlink:href="#linearGradient6049" 22.124 - id="linearGradient6974" 22.125 - gradientUnits="userSpaceOnUse" 22.126 - gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 22.127 - x1="333.91171" 22.128 - y1="488.79077" 22.129 - x2="508.94543" 22.130 - y2="263.79077" /> 22.131 - <linearGradient 22.132 - inkscape:collect="always" 22.133 - xlink:href="#linearGradient6049" 22.134 - id="linearGradient6996" 22.135 - gradientUnits="userSpaceOnUse" 22.136 - gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 22.137 - x1="333.91171" 22.138 - y1="488.79077" 22.139 - x2="508.94543" 22.140 - y2="263.79077" /> 22.141 - </defs> 22.142 - <sodipodi:namedview 22.143 - id="base" 22.144 - pagecolor="#ffffff" 22.145 - bordercolor="#666666" 22.146 - borderopacity="1.0" 22.147 - gridtolerance="10000" 22.148 - guidetolerance="10" 22.149 - objecttolerance="10" 22.150 - inkscape:pageopacity="0.0" 22.151 - inkscape:pageshadow="2" 22.152 - inkscape:zoom="0.90509668" 22.153 - inkscape:cx="390.0539" 22.154 - inkscape:cy="690.49342" 22.155 - inkscape:document-units="px" 22.156 - inkscape:current-layer="layer1" 22.157 - showguides="true" 22.158 - inkscape:guide-bbox="true" 22.159 - inkscape:window-width="906" 22.160 - inkscape:window-height="620" 22.161 - inkscape:window-x="0" 22.162 - inkscape:window-y="25"> 22.163 - <sodipodi:guide 22.164 - orientation="vertical" 22.165 - position="-1.4285714" 22.166 - id="guide6022" /> 22.167 - </sodipodi:namedview> 22.168 - <metadata 22.169 - id="metadata5976"> 22.170 - <rdf:RDF> 22.171 - <cc:Work 22.172 - rdf:about=""> 22.173 - <dc:format>image/svg+xml</dc:format> 22.174 - <dc:type 22.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 22.176 - </cc:Work> 22.177 - </rdf:RDF> 22.178 - </metadata> 22.179 - <g 22.180 - inkscape:label="Layer 1" 22.181 - inkscape:groupmode="layer" 22.182 - id="layer1"> 22.183 - <rect 22.184 - y="245.94225" 22.185 - x="20.198257" 22.186 - height="204.51619" 22.187 - width="174.36833" 22.188 - id="rect6047" 22.189 - style="fill:url(#linearGradient6974);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" /> 22.190 - <rect 22.191 - 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" 22.192 - id="rect5996" 22.193 - width="134.53746" 22.194 - height="44.537449" 22.195 - x="40.113693" 22.196 - y="266.24374" /> 22.197 - <text 22.198 - xml:space="preserve" 22.199 - 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" 22.200 - x="64.796204" 22.201 - y="292.00446" 22.202 - id="text5998"><tspan 22.203 - sodipodi:role="line" 22.204 - id="tspan6000" 22.205 - x="64.796204" 22.206 - y="292.00446" 22.207 - style="font-family:Courier">e7639888bb2f</tspan></text> 22.208 - <g 22.209 - id="g6976"> 22.210 - <rect 22.211 - y="327.9104" 22.212 - x="40.113693" 22.213 - height="44.537449" 22.214 - width="134.53746" 22.215 - id="rect6004" 22.216 - 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" /> 22.217 - <text 22.218 - id="text6006" 22.219 - y="353.67111" 22.220 - x="62.654205" 22.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" 22.222 - xml:space="preserve"><tspan 22.223 - style="font-family:Courier" 22.224 - y="353.67111" 22.225 - x="62.654205" 22.226 - id="tspan6008" 22.227 - sodipodi:role="line">7b064d8bac5e</tspan></text> 22.228 - </g> 22.229 - <path 22.230 - inkscape:connection-end="#rect6004" 22.231 - inkscape:connector-type="polyline" 22.232 - id="path6020" 22.233 - d="M 107.38242,311.15529 L 107.38242,327.53626" 22.234 - 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" /> 22.235 - <rect 22.236 - 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" 22.237 - id="rect6039" 22.238 - width="134.53746" 22.239 - height="44.537449" 22.240 - x="40.113571" 22.241 - y="389.57703" /> 22.242 - <text 22.243 - xml:space="preserve" 22.244 - 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" 22.245 - x="64.797073" 22.246 - y="415.33771" 22.247 - id="text6041"><tspan 22.248 - sodipodi:role="line" 22.249 - id="tspan6043" 22.250 - x="64.797073" 22.251 - y="415.33771" 22.252 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 22.253 - <path 22.254 - inkscape:connection-end="#rect6039" 22.255 - inkscape:connector-type="polyline" 22.256 - id="path6045" 22.257 - d="M 107.38238,372.82195 L 107.38235,389.20301" 22.258 - 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" /> 22.259 - <text 22.260 - xml:space="preserve" 22.261 - 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" 22.262 - x="19.660461" 22.263 - y="231.36218" 22.264 - id="text6102"><tspan 22.265 - sodipodi:role="line" 22.266 - id="tspan6104" 22.267 - x="19.660461" 22.268 - y="231.36218">History in repository</tspan></text> 22.269 - <rect 22.270 - y="245.94225" 22.271 - x="249.28412" 22.272 - height="204.51619" 22.273 - width="174.36833" 22.274 - id="rect6140" 22.275 - style="fill:url(#linearGradient6996);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" /> 22.276 - <g 22.277 - id="g6130" 22.278 - transform="translate(-45.67459,24.38544)"> 22.279 - <rect 22.280 - 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" 22.281 - id="rect6106" 22.282 - width="134.53746" 22.283 - height="44.537449" 22.284 - x="314.87415" 22.285 - y="257.95059" /> 22.286 - <text 22.287 - xml:space="preserve" 22.288 - 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" 22.289 - x="339.55664" 22.290 - y="283.7113" 22.291 - id="text6108"><tspan 22.292 - sodipodi:role="line" 22.293 - id="tspan6110" 22.294 - x="339.55664" 22.295 - y="283.7113" 22.296 - style="font-family:Courier">7b064d8bac5e</tspan></text> 22.297 - </g> 22.298 - <g 22.299 - id="g6135" 22.300 - transform="translate(-44.96042,49.83106)"> 22.301 - <rect 22.302 - inkscape:transform-center-y="102.85714" 22.303 - inkscape:transform-center-x="129.28571" 22.304 - 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" 22.305 - id="rect6112" 22.306 - width="134.53746" 22.307 - height="44.537449" 22.308 - x="314.15985" 22.309 - y="326.52203" /> 22.310 - <text 22.311 - inkscape:transform-center-y="102.7311" 22.312 - inkscape:transform-center-x="128.69672" 22.313 - xml:space="preserve" 22.314 - 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" 22.315 - x="338.84335" 22.316 - y="352.28271" 22.317 - id="text6114"><tspan 22.318 - sodipodi:role="line" 22.319 - id="tspan6116" 22.320 - x="338.84335" 22.321 - y="352.28271" 22.322 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 22.323 - </g> 22.324 - <text 22.325 - xml:space="preserve" 22.326 - 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" 22.327 - x="268.63208" 22.328 - y="270.479" 22.329 - id="text6118"><tspan 22.330 - sodipodi:role="line" 22.331 - id="tspan6120" 22.332 - x="268.63208" 22.333 - y="270.479">First parent</tspan></text> 22.334 - <text 22.335 - xml:space="preserve" 22.336 - 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" 22.337 - x="268.07544" 22.338 - y="364.49615" 22.339 - id="text6122"><tspan 22.340 - sodipodi:role="line" 22.341 - id="tspan6124" 22.342 - x="268.07544" 22.343 - y="364.49615">Second parent</tspan></text> 22.344 - <text 22.345 - xml:space="preserve" 22.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" 22.347 - x="248.61746" 22.348 - y="231.36218" 22.349 - id="text6195"><tspan 22.350 - sodipodi:role="line" 22.351 - id="tspan6197" 22.352 - x="248.61746" 22.353 - y="231.36218">Parents of working directory</tspan></text> 22.354 - <path 22.355 - 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;display:inline" 22.356 - d="M 268.82543,318.06163 L 175.02528,336.72225" 22.357 - id="path6266" 22.358 - inkscape:connector-type="polyline" 22.359 - inkscape:connection-end="#g6976" 22.360 - inkscape:connection-start="#g6130" /> 22.361 - <path 22.362 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 22.363 - d="M 665.12232,418.17579 L 665.12232,418.17579" 22.364 - id="path6270" 22.365 - inkscape:connector-type="polyline" /> 22.366 - </g> 22.367 -</svg>
23.1 --- a/en/figs/wdir.svg Thu Mar 12 15:53:01 2009 +0800 23.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 23.3 @@ -1,348 +0,0 @@ 23.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 23.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 23.6 -<svg 23.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 23.8 - xmlns:cc="http://web.resource.org/cc/" 23.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 23.10 - xmlns:svg="http://www.w3.org/2000/svg" 23.11 - xmlns="http://www.w3.org/2000/svg" 23.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 23.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 23.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 23.15 - width="744.09448819" 23.16 - height="1052.3622047" 23.17 - id="svg5971" 23.18 - sodipodi:version="0.32" 23.19 - inkscape:version="0.44.1" 23.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 23.21 - sodipodi:docname="wdir.svg"> 23.22 - <defs 23.23 - id="defs5973"> 23.24 - <marker 23.25 - inkscape:stockid="Arrow1Mstart" 23.26 - orient="auto" 23.27 - refY="0.0" 23.28 - refX="0.0" 23.29 - id="Arrow1Mstart" 23.30 - style="overflow:visible"> 23.31 - <path 23.32 - id="path4855" 23.33 - 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 " 23.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 23.35 - transform="scale(0.4) translate(10,0)" /> 23.36 - </marker> 23.37 - <linearGradient 23.38 - id="linearGradient6049"> 23.39 - <stop 23.40 - style="stop-color:#686868;stop-opacity:1;" 23.41 - offset="0" 23.42 - id="stop6051" /> 23.43 - <stop 23.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 23.45 - offset="1" 23.46 - id="stop6053" /> 23.47 - </linearGradient> 23.48 - <marker 23.49 - inkscape:stockid="Arrow1Mend" 23.50 - orient="auto" 23.51 - refY="0.0" 23.52 - refX="0.0" 23.53 - id="Arrow1Mend" 23.54 - style="overflow:visible;"> 23.55 - <path 23.56 - id="path4852" 23.57 - 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 " 23.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 23.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 23.60 - </marker> 23.61 - <linearGradient 23.62 - inkscape:collect="always" 23.63 - xlink:href="#linearGradient6049" 23.64 - id="linearGradient6083" 23.65 - gradientUnits="userSpaceOnUse" 23.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 23.67 - x1="333.91171" 23.68 - y1="488.79077" 23.69 - x2="508.94543" 23.70 - y2="263.79077" /> 23.71 - <linearGradient 23.72 - inkscape:collect="always" 23.73 - xlink:href="#linearGradient6049" 23.74 - id="linearGradient6142" 23.75 - gradientUnits="userSpaceOnUse" 23.76 - gradientTransform="translate(-42.00893,-30.49544)" 23.77 - x1="333.91171" 23.78 - y1="488.79077" 23.79 - x2="508.94543" 23.80 - y2="263.79077" /> 23.81 - <linearGradient 23.82 - inkscape:collect="always" 23.83 - xlink:href="#linearGradient6049" 23.84 - id="linearGradient6193" 23.85 - gradientUnits="userSpaceOnUse" 23.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 23.87 - x1="333.91171" 23.88 - y1="488.79077" 23.89 - x2="508.94543" 23.90 - y2="263.79077" /> 23.91 - <linearGradient 23.92 - inkscape:collect="always" 23.93 - xlink:href="#linearGradient6049" 23.94 - id="linearGradient6216" 23.95 - gradientUnits="userSpaceOnUse" 23.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 23.97 - x1="333.91171" 23.98 - y1="488.79077" 23.99 - x2="508.94543" 23.100 - y2="263.79077" /> 23.101 - <linearGradient 23.102 - inkscape:collect="always" 23.103 - xlink:href="#linearGradient6049" 23.104 - id="linearGradient6232" 23.105 - gradientUnits="userSpaceOnUse" 23.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 23.107 - x1="333.91171" 23.108 - y1="488.79077" 23.109 - x2="508.94543" 23.110 - y2="263.79077" /> 23.111 - <linearGradient 23.112 - inkscape:collect="always" 23.113 - xlink:href="#linearGradient6049" 23.114 - id="linearGradient6445" 23.115 - gradientUnits="userSpaceOnUse" 23.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 23.117 - x1="333.91171" 23.118 - y1="488.79077" 23.119 - x2="508.94543" 23.120 - y2="263.79077" /> 23.121 - </defs> 23.122 - <sodipodi:namedview 23.123 - id="base" 23.124 - pagecolor="#ffffff" 23.125 - bordercolor="#666666" 23.126 - borderopacity="1.0" 23.127 - gridtolerance="10000" 23.128 - guidetolerance="10" 23.129 - objecttolerance="10" 23.130 - inkscape:pageopacity="0.0" 23.131 - inkscape:pageshadow="2" 23.132 - inkscape:zoom="0.90509668" 23.133 - inkscape:cx="390.0539" 23.134 - inkscape:cy="690.49342" 23.135 - inkscape:document-units="px" 23.136 - inkscape:current-layer="layer1" 23.137 - showguides="true" 23.138 - inkscape:guide-bbox="true" 23.139 - inkscape:window-width="906" 23.140 - inkscape:window-height="620" 23.141 - inkscape:window-x="0" 23.142 - inkscape:window-y="25"> 23.143 - <sodipodi:guide 23.144 - orientation="vertical" 23.145 - position="-1.4285714" 23.146 - id="guide6022" /> 23.147 - </sodipodi:namedview> 23.148 - <metadata 23.149 - id="metadata5976"> 23.150 - <rdf:RDF> 23.151 - <cc:Work 23.152 - rdf:about=""> 23.153 - <dc:format>image/svg+xml</dc:format> 23.154 - <dc:type 23.155 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 23.156 - </cc:Work> 23.157 - </rdf:RDF> 23.158 - </metadata> 23.159 - <g 23.160 - inkscape:label="Layer 1" 23.161 - inkscape:groupmode="layer" 23.162 - id="layer1"> 23.163 - <g 23.164 - id="g6431" 23.165 - transform="translate(0,-0.137863)"> 23.166 - <rect 23.167 - style="fill:url(#linearGradient6445);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" 23.168 - id="rect6047" 23.169 - width="174.36833" 23.170 - height="204.51619" 23.171 - x="94.198257" 23.172 - y="246.08011" /> 23.173 - <rect 23.174 - y="266.38159" 23.175 - x="114.11369" 23.176 - height="44.537449" 23.177 - width="134.53746" 23.178 - id="rect5996" 23.179 - 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" /> 23.180 - <text 23.181 - id="text5998" 23.182 - y="292.1423" 23.183 - x="138.7962" 23.184 - 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" 23.185 - xml:space="preserve"><tspan 23.186 - style="font-family:Courier" 23.187 - y="292.1423" 23.188 - x="138.7962" 23.189 - id="tspan6000" 23.190 - sodipodi:role="line">e7639888bb2f</tspan></text> 23.191 - <rect 23.192 - y="328.04825" 23.193 - x="114.11369" 23.194 - height="44.537449" 23.195 - width="134.53746" 23.196 - id="rect6004" 23.197 - 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" /> 23.198 - <text 23.199 - id="text6006" 23.200 - y="353.80896" 23.201 - x="136.65421" 23.202 - 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" 23.203 - xml:space="preserve"><tspan 23.204 - style="font-family:Courier" 23.205 - y="353.80896" 23.206 - x="136.65421" 23.207 - id="tspan6008" 23.208 - sodipodi:role="line">7b064d8bac5e</tspan></text> 23.209 - <path 23.210 - 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" 23.211 - d="M 181.38242,311.29315 L 181.38242,327.67412" 23.212 - id="path6020" 23.213 - inkscape:connector-type="polyline" 23.214 - inkscape:connection-end="#rect6004" /> 23.215 - <rect 23.216 - y="389.71487" 23.217 - x="114.11357" 23.218 - height="44.537449" 23.219 - width="134.53746" 23.220 - id="rect6039" 23.221 - 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" /> 23.222 - <text 23.223 - id="text6041" 23.224 - y="415.47556" 23.225 - x="138.79707" 23.226 - 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" 23.227 - xml:space="preserve"><tspan 23.228 - style="fill:#979797;fill-opacity:1;font-family:Courier" 23.229 - y="415.47556" 23.230 - x="138.79707" 23.231 - id="tspan6043" 23.232 - sodipodi:role="line">000000000000</tspan></text> 23.233 - <path 23.234 - 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" 23.235 - d="M 181.38238,372.95981 L 181.38235,389.34087" 23.236 - id="path6045" 23.237 - inkscape:connector-type="polyline" 23.238 - inkscape:connection-end="#rect6039" /> 23.239 - </g> 23.240 - <text 23.241 - xml:space="preserve" 23.242 - 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" 23.243 - x="93.660484" 23.244 - y="231.36218" 23.245 - id="text6102"><tspan 23.246 - sodipodi:role="line" 23.247 - id="tspan6104" 23.248 - x="93.660484" 23.249 - y="231.36218">History in repository</tspan></text> 23.250 - <g 23.251 - id="g6416"> 23.252 - <rect 23.253 - 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" 23.254 - id="rect6140" 23.255 - width="174.36833" 23.256 - height="204.51619" 23.257 - x="323.28412" 23.258 - y="245.94225" /> 23.259 - <g 23.260 - transform="translate(28.32541,24.38544)" 23.261 - id="g6130"> 23.262 - <rect 23.263 - y="257.95059" 23.264 - x="314.87415" 23.265 - height="44.537449" 23.266 - width="134.53746" 23.267 - id="rect6106" 23.268 - 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" /> 23.269 - <text 23.270 - id="text6108" 23.271 - y="283.7113" 23.272 - x="339.55664" 23.273 - 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" 23.274 - xml:space="preserve"><tspan 23.275 - style="font-family:Courier" 23.276 - y="283.7113" 23.277 - x="339.55664" 23.278 - id="tspan6110" 23.279 - sodipodi:role="line">e7639888bb2f</tspan></text> 23.280 - </g> 23.281 - <g 23.282 - transform="translate(29.03958,49.83106)" 23.283 - id="g6135"> 23.284 - <rect 23.285 - y="326.52203" 23.286 - x="314.15985" 23.287 - height="44.537449" 23.288 - width="134.53746" 23.289 - id="rect6112" 23.290 - 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" 23.291 - inkscape:transform-center-x="129.28571" 23.292 - inkscape:transform-center-y="102.85714" /> 23.293 - <text 23.294 - id="text6114" 23.295 - y="352.28271" 23.296 - x="338.84335" 23.297 - 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" 23.298 - xml:space="preserve" 23.299 - inkscape:transform-center-x="128.69672" 23.300 - inkscape:transform-center-y="102.7311"><tspan 23.301 - style="fill:#979797;fill-opacity:1;font-family:Courier" 23.302 - y="352.28271" 23.303 - x="338.84335" 23.304 - id="tspan6116" 23.305 - sodipodi:role="line">000000000000</tspan></text> 23.306 - </g> 23.307 - <text 23.308 - id="text6118" 23.309 - y="270.479" 23.310 - x="342.63208" 23.311 - 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" 23.312 - xml:space="preserve"><tspan 23.313 - y="270.479" 23.314 - x="342.63208" 23.315 - id="tspan6120" 23.316 - sodipodi:role="line">First parent</tspan></text> 23.317 - <text 23.318 - id="text6122" 23.319 - y="364.49615" 23.320 - x="342.07544" 23.321 - 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" 23.322 - xml:space="preserve"><tspan 23.323 - y="364.49615" 23.324 - x="342.07544" 23.325 - id="tspan6124" 23.326 - sodipodi:role="line">Second parent</tspan></text> 23.327 - </g> 23.328 - <text 23.329 - xml:space="preserve" 23.330 - 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" 23.331 - x="322.61746" 23.332 - y="231.36218" 23.333 - id="text6195"><tspan 23.334 - sodipodi:role="line" 23.335 - id="tspan6197" 23.336 - x="322.61746" 23.337 - y="231.36218">Parents of working directory</tspan></text> 23.338 - <path 23.339 - 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;display:inline" 23.340 - d="M 342.82543,299.89384 L 249.02528,293.36123" 23.341 - id="path6266" 23.342 - inkscape:connector-type="polyline" 23.343 - inkscape:connection-start="#g6130" 23.344 - inkscape:connection-end="#rect5996" /> 23.345 - <path 23.346 - style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 23.347 - d="M 665.12232,418.17579 L 665.12232,418.17579" 23.348 - id="path6270" 23.349 - inkscape:connector-type="polyline" /> 23.350 - </g> 23.351 -</svg>
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/en/images/feature-branches.dot Thu Mar 12 15:58:38 2009 +0800 24.3 @@ -0,0 +1,8 @@ 24.4 +digraph feature_branches { 24.5 + master -> crypto; 24.6 + master -> filesystems; 24.7 + master -> ipc; 24.8 + master -> memory; 24.9 + master -> network; 24.10 + master -> security; 24.11 +}
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/en/images/filelog.svg Thu Mar 12 15:58:38 2009 +0800 25.3 @@ -0,0 +1,373 @@ 25.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 25.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 25.6 +<svg 25.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 25.8 + xmlns:cc="http://web.resource.org/cc/" 25.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 25.10 + xmlns:svg="http://www.w3.org/2000/svg" 25.11 + xmlns="http://www.w3.org/2000/svg" 25.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 25.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 25.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 25.15 + width="744.09448819" 25.16 + height="1052.3622047" 25.17 + id="svg2" 25.18 + sodipodi:version="0.32" 25.19 + inkscape:version="0.45.1" 25.20 + sodipodi:docname="filelog.svg" 25.21 + sodipodi:docbase="/home/arun/hgbook/en" 25.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 25.23 + <defs 25.24 + id="defs4"> 25.25 + <marker 25.26 + inkscape:stockid="Arrow1Mend" 25.27 + orient="auto" 25.28 + refY="0.0" 25.29 + refX="0.0" 25.30 + id="Arrow1Mend" 25.31 + style="overflow:visible;"> 25.32 + <path 25.33 + id="path3128" 25.34 + 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 " 25.35 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 25.36 + transform="scale(0.4) rotate(180) translate(10,0)" /> 25.37 + </marker> 25.38 + <linearGradient 25.39 + id="linearGradient2887"> 25.40 + <stop 25.41 + style="stop-color:#91cfcf;stop-opacity:1;" 25.42 + offset="0" 25.43 + id="stop2889" /> 25.44 + <stop 25.45 + style="stop-color:aqua;stop-opacity:0;" 25.46 + offset="1" 25.47 + id="stop2891" /> 25.48 + </linearGradient> 25.49 + <linearGradient 25.50 + id="linearGradient2795"> 25.51 + <stop 25.52 + style="stop-color:#ccc;stop-opacity:1;" 25.53 + offset="0" 25.54 + id="stop2797" /> 25.55 + <stop 25.56 + style="stop-color:#ccc;stop-opacity:0;" 25.57 + offset="1" 25.58 + id="stop2799" /> 25.59 + </linearGradient> 25.60 + <linearGradient 25.61 + inkscape:collect="always" 25.62 + xlink:href="#linearGradient2795" 25.63 + id="linearGradient3170" 25.64 + gradientUnits="userSpaceOnUse" 25.65 + gradientTransform="translate(121.2183,94.95434)" 25.66 + x1="81.322357" 25.67 + y1="404.34424" 25.68 + x2="201.52036" 25.69 + y2="373.03967" /> 25.70 + <linearGradient 25.71 + inkscape:collect="always" 25.72 + xlink:href="#linearGradient2887" 25.73 + id="linearGradient3172" 25.74 + gradientUnits="userSpaceOnUse" 25.75 + gradientTransform="translate(0,12)" 25.76 + x1="62.634491" 25.77 + y1="503.3392" 25.78 + x2="248.49242" 25.79 + y2="462.94327" /> 25.80 + <linearGradient 25.81 + inkscape:collect="always" 25.82 + xlink:href="#linearGradient2795" 25.83 + id="linearGradient3174" 25.84 + gradientUnits="userSpaceOnUse" 25.85 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 25.86 + x1="81.322357" 25.87 + y1="404.34424" 25.88 + x2="201.52036" 25.89 + y2="373.03967" /> 25.90 + <linearGradient 25.91 + inkscape:collect="always" 25.92 + xlink:href="#linearGradient2887" 25.93 + id="linearGradient3176" 25.94 + gradientUnits="userSpaceOnUse" 25.95 + gradientTransform="translate(0,12)" 25.96 + x1="62.634491" 25.97 + y1="503.3392" 25.98 + x2="248.49242" 25.99 + y2="462.94327" /> 25.100 + <linearGradient 25.101 + inkscape:collect="always" 25.102 + xlink:href="#linearGradient2795" 25.103 + id="linearGradient3208" 25.104 + gradientUnits="userSpaceOnUse" 25.105 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 25.106 + x1="81.322357" 25.107 + y1="404.34424" 25.108 + x2="201.52036" 25.109 + y2="373.03967" /> 25.110 + <linearGradient 25.111 + inkscape:collect="always" 25.112 + xlink:href="#linearGradient2887" 25.113 + id="linearGradient3210" 25.114 + gradientUnits="userSpaceOnUse" 25.115 + gradientTransform="translate(0,12)" 25.116 + x1="62.634491" 25.117 + y1="503.3392" 25.118 + x2="248.49242" 25.119 + y2="462.94327" /> 25.120 + <linearGradient 25.121 + inkscape:collect="always" 25.122 + xlink:href="#linearGradient2795" 25.123 + id="linearGradient3212" 25.124 + gradientUnits="userSpaceOnUse" 25.125 + gradientTransform="translate(121.2183,94.95434)" 25.126 + x1="81.322357" 25.127 + y1="404.34424" 25.128 + x2="201.52036" 25.129 + y2="373.03967" /> 25.130 + <linearGradient 25.131 + inkscape:collect="always" 25.132 + xlink:href="#linearGradient2887" 25.133 + id="linearGradient3214" 25.134 + gradientUnits="userSpaceOnUse" 25.135 + gradientTransform="translate(0,12)" 25.136 + x1="62.634491" 25.137 + y1="503.3392" 25.138 + x2="248.49242" 25.139 + y2="462.94327" /> 25.140 + <linearGradient 25.141 + inkscape:collect="always" 25.142 + xlink:href="#linearGradient2795" 25.143 + id="linearGradient3256" 25.144 + gradientUnits="userSpaceOnUse" 25.145 + gradientTransform="matrix(1.2343775,0,0,0.9981848,103.25588,95.681888)" 25.146 + x1="74.301666" 25.147 + y1="431.67441" 25.148 + x2="260.05884" 25.149 + y2="369.95322" /> 25.150 + <linearGradient 25.151 + inkscape:collect="always" 25.152 + xlink:href="#linearGradient2887" 25.153 + id="linearGradient3258" 25.154 + gradientUnits="userSpaceOnUse" 25.155 + gradientTransform="matrix(1.228929,0,0,0.9972824,-62.037003,13.312997)" 25.156 + x1="62.634491" 25.157 + y1="503.3392" 25.158 + x2="248.49242" 25.159 + y2="462.94327" /> 25.160 + <linearGradient 25.161 + inkscape:collect="always" 25.162 + xlink:href="#linearGradient2795" 25.163 + id="linearGradient3260" 25.164 + gradientUnits="userSpaceOnUse" 25.165 + gradientTransform="matrix(1.2300738,0,0,0.6517275,219.97511,153.61527)" 25.166 + x1="74.387527" 25.167 + y1="431.80576" 25.168 + x2="259.97339" 25.169 + y2="369.82224" /> 25.170 + <linearGradient 25.171 + inkscape:collect="always" 25.172 + xlink:href="#linearGradient2887" 25.173 + id="linearGradient3262" 25.174 + gradientUnits="userSpaceOnUse" 25.175 + gradientTransform="matrix(1.2289272,0,0,0.9972824,-62.036756,13.312985)" 25.176 + x1="62.634491" 25.177 + y1="503.3392" 25.178 + x2="248.49242" 25.179 + y2="462.94327" /> 25.180 + </defs> 25.181 + <sodipodi:namedview 25.182 + id="base" 25.183 + pagecolor="#ffffff" 25.184 + bordercolor="#666666" 25.185 + borderopacity="1.0" 25.186 + gridtolerance="10000" 25.187 + guidetolerance="10" 25.188 + objecttolerance="10" 25.189 + inkscape:pageopacity="0.0" 25.190 + inkscape:pageshadow="2" 25.191 + inkscape:zoom="1.4" 25.192 + inkscape:cx="455.8122" 25.193 + inkscape:cy="520" 25.194 + inkscape:document-units="px" 25.195 + inkscape:current-layer="layer1" 25.196 + inkscape:window-width="1680" 25.197 + inkscape:window-height="970" 25.198 + inkscape:window-x="0" 25.199 + inkscape:window-y="54" /> 25.200 + <metadata 25.201 + id="metadata7"> 25.202 + <rdf:RDF> 25.203 + <cc:Work 25.204 + rdf:about=""> 25.205 + <dc:format>image/svg+xml</dc:format> 25.206 + <dc:type 25.207 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 25.208 + </cc:Work> 25.209 + </rdf:RDF> 25.210 + </metadata> 25.211 + <g 25.212 + inkscape:label="Layer 1" 25.213 + inkscape:groupmode="layer" 25.214 + id="layer1"> 25.215 + <rect 25.216 + style="opacity:1;fill:#abadf8;fill-opacity:1;stroke:#595959;stroke-width:0.93760371;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 25.217 + id="rect3180" 25.218 + width="273.81375" 25.219 + height="199.06245" 25.220 + x="369.1796" 25.221 + y="351.79019" /> 25.222 + <rect 25.223 + style="opacity:1;fill:#a2f69c;fill-opacity:1;stroke:#595959;stroke-width:0.93760341;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 25.224 + id="rect3178" 25.225 + width="273.81339" 25.226 + height="199.06233" 25.227 + x="72.699799" 25.228 + y="351.78983" /> 25.229 + <g 25.230 + id="g3144" 25.231 + transform="translate(80.467048,0.71578)"> 25.232 + <g 25.233 + id="g2940"> 25.234 + <rect 25.235 + style="fill:url(#linearGradient3260);fill-opacity:1;stroke:#000000;stroke-width:0.89536202;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 25.236 + id="rect2914" 25.237 + width="227.38896" 25.238 + height="39.500999" 25.239 + x="311.92496" 25.240 + y="395.08627" /> 25.241 + <text 25.242 + xml:space="preserve" 25.243 + 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" 25.244 + x="323.72824" 25.245 + y="416.7626" 25.246 + id="text2918"><tspan 25.247 + sodipodi:role="line" 25.248 + id="tspan2920" 25.249 + x="323.72824" 25.250 + y="416.7626" 25.251 + style="font-family:Courier">.hg/store/data/README.i</tspan></text> 25.252 + </g> 25.253 + <g 25.254 + transform="translate(3.79093e-5,-80.1853)" 25.255 + id="g2945"> 25.256 + <g 25.257 + id="g2955"> 25.258 + <rect 25.259 + y="475.4968" 25.260 + x="15.550935" 25.261 + height="39.500999" 25.262 + width="227.17694" 25.263 + id="rect2947" 25.264 + style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#000000;stroke-width:1.10706258;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 25.265 + <text 25.266 + id="text2949" 25.267 + y="498.35123" 25.268 + x="31.230644" 25.269 + 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" 25.270 + xml:space="preserve"><tspan 25.271 + style="font-family:Courier" 25.272 + y="498.35123" 25.273 + x="31.230644" 25.274 + id="tspan2951" 25.275 + sodipodi:role="line">README</tspan></text> 25.276 + </g> 25.277 + </g> 25.278 + <path 25.279 + inkscape:connector-type="polyline" 25.280 + id="path2960" 25.281 + d="M 242.94685,414.91115 C 242.94685,414.91115 293.61127,415.26754 310.16269,415.38633" 25.282 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.02046943px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 25.283 + sodipodi:nodetypes="cz" /> 25.284 + </g> 25.285 + <g 25.286 + id="g3156" 25.287 + transform="translate(80.467048,0.71578)"> 25.288 + <g 25.289 + transform="translate(116,0)" 25.290 + id="g2831"> 25.291 + <rect 25.292 + style="fill:url(#linearGradient3256);fill-opacity:1;stroke:#000000;stroke-width:1.11001658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 25.293 + id="rect1906" 25.294 + width="228.18446" 25.295 + height="60.499123" 25.296 + x="195.52719" 25.297 + y="465.51859" /> 25.298 + <g 25.299 + id="g2803" 25.300 + transform="translate(-0.893671,1.833581)"> 25.301 + <text 25.302 + id="text1884" 25.303 + y="483.92801" 25.304 + x="208.95944" 25.305 + 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" 25.306 + xml:space="preserve"><tspan 25.307 + style="font-family:Courier" 25.308 + y="483.92801" 25.309 + x="208.95944" 25.310 + id="tspan1886" 25.311 + sodipodi:role="line">.hg/store/data/src/hello.c.d</tspan></text> 25.312 + <text 25.313 + id="text1888" 25.314 + y="507.79309" 25.315 + x="208.95944" 25.316 + 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" 25.317 + xml:space="preserve"><tspan 25.318 + style="font-family:Courier" 25.319 + y="507.79309" 25.320 + x="208.95944" 25.321 + id="tspan1890" 25.322 + sodipodi:role="line">.hg/store/data/src/hello.c.i</tspan></text> 25.323 + </g> 25.324 + </g> 25.325 + <g 25.326 + id="g2907"> 25.327 + <rect 25.328 + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:#000000;stroke-width:1.10706329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 25.329 + id="rect2843" 25.330 + width="227.17728" 25.331 + height="39.500999" 25.332 + x="15.550805" 25.333 + y="475.4968" /> 25.334 + <text 25.335 + xml:space="preserve" 25.336 + 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" 25.337 + x="31.230644" 25.338 + y="498.35123" 25.339 + id="text2847"><tspan 25.340 + sodipodi:role="line" 25.341 + id="tspan2849" 25.342 + x="31.230644" 25.343 + y="498.35123" 25.344 + style="font-family:Courier">src/hello.c</tspan></text> 25.345 + </g> 25.346 + <path 25.347 + inkscape:connection-end="#g2831" 25.348 + inkscape:connection-start="#g2907" 25.349 + inkscape:connector-type="polyline" 25.350 + id="path2962" 25.351 + d="M 242.4315,495.88043 C 242.4315,495.88043 292.8861,495.99942 310.04102,496.03909" 25.352 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 25.353 + sodipodi:nodetypes="cs" /> 25.354 + </g> 25.355 + <text 25.356 + xml:space="preserve" 25.357 + 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" 25.358 + x="98.496666" 25.359 + y="373.96353" 25.360 + id="text3216"><tspan 25.361 + sodipodi:role="line" 25.362 + id="tspan3218" 25.363 + x="98.496666" 25.364 + y="373.96353">Working directory</tspan></text> 25.365 + <text 25.366 + xml:space="preserve" 25.367 + 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" 25.368 + x="391.39197" 25.369 + y="373.96353" 25.370 + id="text3228"><tspan 25.371 + sodipodi:role="line" 25.372 + id="tspan3230" 25.373 + x="391.39197" 25.374 + y="373.96353">Repository</tspan></text> 25.375 + </g> 25.376 +</svg>
26.1 Binary file en/images/kdiff3.png has changed
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/en/images/metadata.svg Thu Mar 12 15:58:38 2009 +0800 27.3 @@ -0,0 +1,328 @@ 27.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 27.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 27.6 +<svg 27.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 27.8 + xmlns:cc="http://web.resource.org/cc/" 27.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 27.10 + xmlns:svg="http://www.w3.org/2000/svg" 27.11 + xmlns="http://www.w3.org/2000/svg" 27.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 27.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 27.14 + width="744.09448819" 27.15 + height="1052.3622047" 27.16 + id="svg2" 27.17 + sodipodi:version="0.32" 27.18 + inkscape:version="0.44.1" 27.19 + sodipodi:docname="metadata.svg" 27.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 27.21 + <defs 27.22 + id="defs4"> 27.23 + <marker 27.24 + inkscape:stockid="Arrow1Mend" 27.25 + orient="auto" 27.26 + refY="0.0" 27.27 + refX="0.0" 27.28 + id="Arrow1Mend" 27.29 + style="overflow:visible;"> 27.30 + <path 27.31 + id="path2944" 27.32 + 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 " 27.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 27.34 + transform="scale(0.4) rotate(180) translate(10,0)" /> 27.35 + </marker> 27.36 + </defs> 27.37 + <sodipodi:namedview 27.38 + id="base" 27.39 + pagecolor="#ffffff" 27.40 + bordercolor="#666666" 27.41 + borderopacity="1.0" 27.42 + gridtolerance="10000" 27.43 + guidetolerance="10" 27.44 + objecttolerance="10" 27.45 + inkscape:pageopacity="0.0" 27.46 + inkscape:pageshadow="2" 27.47 + inkscape:zoom="1.4" 27.48 + inkscape:cx="232.14286" 27.49 + inkscape:cy="490.68696" 27.50 + inkscape:document-units="px" 27.51 + inkscape:current-layer="layer1" 27.52 + inkscape:window-width="906" 27.53 + inkscape:window-height="620" 27.54 + inkscape:window-x="181" 27.55 + inkscape:window-y="58" /> 27.56 + <metadata 27.57 + id="metadata7"> 27.58 + <rdf:RDF> 27.59 + <cc:Work 27.60 + rdf:about=""> 27.61 + <dc:format>image/svg+xml</dc:format> 27.62 + <dc:type 27.63 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 27.64 + </cc:Work> 27.65 + </rdf:RDF> 27.66 + </metadata> 27.67 + <g 27.68 + inkscape:label="Layer 1" 27.69 + inkscape:groupmode="layer" 27.70 + id="layer1"> 27.71 + <path 27.72 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 27.73 + d="M 326.94646,467.18359 L 326.94646,510.98123" 27.74 + id="path1910" 27.75 + inkscape:connector-type="polyline" 27.76 + inkscape:connection-end="#rect2962" 27.77 + inkscape:connection-start="#rect2764" /> 27.78 + <path 27.79 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 27.80 + d="M 326.94646,531.98123 L 326.94646,591.77887" 27.81 + id="path1912" 27.82 + inkscape:connector-type="polyline" 27.83 + inkscape:connection-start="#rect2962" 27.84 + inkscape:connection-end="#rect3000" /> 27.85 + <path 27.86 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 27.87 + d="M 316.1622,531.98123 L 192.30212,652.57648" 27.88 + id="path1916" 27.89 + inkscape:connector-type="polyline" 27.90 + inkscape:connection-end="#rect3038" 27.91 + inkscape:connection-start="#rect2962" /> 27.92 + <path 27.93 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 27.94 + d="M 254.23217,467.18359 L 254.23216,510.98123" 27.95 + id="path3088" 27.96 + inkscape:connector-type="polyline" 27.97 + inkscape:connection-start="#rect1872" 27.98 + inkscape:connection-end="#rect2960" /> 27.99 + <path 27.100 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 27.101 + d="M 254.23215,531.98123 L 254.23215,591.77887" 27.102 + id="path3090" 27.103 + inkscape:connector-type="polyline" 27.104 + inkscape:connection-start="#rect2960" 27.105 + inkscape:connection-end="#rect2998" /> 27.106 + <path 27.107 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 27.108 + d="M 248.84002,531.98123 L 186.90999,652.57648" 27.109 + id="path3092" 27.110 + inkscape:connector-type="polyline" 27.111 + inkscape:connection-start="#rect2960" 27.112 + inkscape:connection-end="#rect3038" /> 27.113 + <rect 27.114 + style="fill:#7b7df5;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.115 + id="rect1872" 27.116 + width="51.42857" 27.117 + height="20" 27.118 + x="228.51788" 27.119 + y="446.68359" /> 27.120 + <rect 27.121 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.122 + id="rect2764" 27.123 + width="51.42857" 27.124 + height="20" 27.125 + x="301.23218" 27.126 + y="446.68359" /> 27.127 + <rect 27.128 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.129 + id="rect2766" 27.130 + width="51.42857" 27.131 + height="20" 27.132 + x="155.80359" 27.133 + y="446.68359" /> 27.134 + <rect 27.135 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.136 + id="rect2768" 27.137 + width="51.42857" 27.138 + height="20" 27.139 + x="83.089294" 27.140 + y="446.68359" /> 27.141 + <path 27.142 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.143 + d="M 135.01786,456.68359 L 155.30359,456.68359" 27.144 + id="path2770" 27.145 + inkscape:connector-type="polyline" 27.146 + inkscape:connection-start="#rect2768" 27.147 + inkscape:connection-end="#rect2766" /> 27.148 + <path 27.149 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.150 + d="M 207.73216,456.68359 L 228.01788,456.68359" 27.151 + id="path2772" 27.152 + inkscape:connector-type="polyline" 27.153 + inkscape:connection-start="#rect2766" 27.154 + inkscape:connection-end="#rect1872" /> 27.155 + <path 27.156 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.157 + d="M 280.44645,456.68359 L 300.73218,456.68359" 27.158 + id="path2774" 27.159 + inkscape:connector-type="polyline" 27.160 + inkscape:connection-start="#rect1872" 27.161 + inkscape:connection-end="#rect2764" /> 27.162 + <path 27.163 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 27.164 + d="M 62.303571,456.68359 L 82.589294,456.68359" 27.165 + id="path2778" 27.166 + inkscape:connector-type="polyline" 27.167 + inkscape:connection-end="#rect2768" /> 27.168 + <rect 27.169 + style="fill:#84f57b;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.170 + id="rect2960" 27.171 + width="51.42857" 27.172 + height="20" 27.173 + x="228.51787" 27.174 + y="511.48123" /> 27.175 + <rect 27.176 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.177 + id="rect2962" 27.178 + width="51.42857" 27.179 + height="20" 27.180 + x="301.23218" 27.181 + y="511.48123" /> 27.182 + <rect 27.183 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.184 + id="rect2964" 27.185 + width="51.42857" 27.186 + height="20" 27.187 + x="155.80357" 27.188 + y="511.48123" /> 27.189 + <rect 27.190 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.191 + id="rect2966" 27.192 + width="51.42857" 27.193 + height="20" 27.194 + x="83.089287" 27.195 + y="511.48123" /> 27.196 + <path 27.197 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.198 + d="M 135.01786,521.48121 L 155.30359,521.48121" 27.199 + id="path2968" 27.200 + inkscape:connector-type="polyline" /> 27.201 + <path 27.202 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.203 + d="M 207.73216,521.48121 L 228.01788,521.48121" 27.204 + id="path2970" 27.205 + inkscape:connector-type="polyline" /> 27.206 + <path 27.207 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.208 + d="M 280.44645,521.48121 L 300.73218,521.48121" 27.209 + id="path2972" 27.210 + inkscape:connector-type="polyline" /> 27.211 + <path 27.212 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 27.213 + d="M 62.30358,521.48121 L 82.5893,521.48121" 27.214 + id="path2974" 27.215 + inkscape:connector-type="polyline" /> 27.216 + <rect 27.217 + style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.218 + id="rect2998" 27.219 + width="51.42857" 27.220 + height="20" 27.221 + x="228.51787" 27.222 + y="592.27887" /> 27.223 + <rect 27.224 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.225 + id="rect3000" 27.226 + width="51.42857" 27.227 + height="20" 27.228 + x="301.23218" 27.229 + y="592.27887" /> 27.230 + <rect 27.231 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.232 + id="rect3002" 27.233 + width="51.42857" 27.234 + height="20" 27.235 + x="155.80357" 27.236 + y="592.27887" /> 27.237 + <rect 27.238 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.239 + id="rect3004" 27.240 + width="51.42857" 27.241 + height="20" 27.242 + x="83.089287" 27.243 + y="592.27887" /> 27.244 + <path 27.245 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.246 + d="M 135.01786,602.27884 L 155.30359,602.27884" 27.247 + id="path3006" 27.248 + inkscape:connector-type="polyline" /> 27.249 + <path 27.250 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.251 + d="M 207.73216,602.27884 L 228.01788,602.27884" 27.252 + id="path3008" 27.253 + inkscape:connector-type="polyline" /> 27.254 + <path 27.255 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.256 + d="M 280.44645,602.27884 L 300.73218,602.27884" 27.257 + id="path3010" 27.258 + inkscape:connector-type="polyline" /> 27.259 + <path 27.260 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 27.261 + d="M 62.30358,602.27884 L 82.5893,602.27884" 27.262 + id="path3012" 27.263 + inkscape:connector-type="polyline" /> 27.264 + <rect 27.265 + style="fill:#ffced6;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.266 + id="rect3034" 27.267 + width="51.42857" 27.268 + height="20" 27.269 + x="228.51787" 27.270 + y="653.07648" /> 27.271 + <rect 27.272 + style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.273 + id="rect3038" 27.274 + width="51.42857" 27.275 + height="20" 27.276 + x="155.80357" 27.277 + y="653.07648" /> 27.278 + <rect 27.279 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 27.280 + id="rect3040" 27.281 + width="51.42857" 27.282 + height="20" 27.283 + x="83.089287" 27.284 + y="653.07648" /> 27.285 + <path 27.286 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.287 + d="M 135.01786,663.07646 L 155.30359,663.07646" 27.288 + id="path3042" 27.289 + inkscape:connector-type="polyline" /> 27.290 + <path 27.291 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 27.292 + d="M 207.73216,663.07646 L 228.01788,663.07646" 27.293 + id="path3044" 27.294 + inkscape:connector-type="polyline" /> 27.295 + <path 27.296 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 27.297 + d="M 62.30358,663.07646 L 82.5893,663.07646" 27.298 + id="path3048" 27.299 + inkscape:connector-type="polyline" /> 27.300 + <text 27.301 + xml:space="preserve" 27.302 + 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" 27.303 + x="82.072548" 27.304 + y="432.64789" 27.305 + id="text3094"><tspan 27.306 + sodipodi:role="line" 27.307 + id="tspan3096" 27.308 + x="82.072548" 27.309 + y="432.64789">Changelog</tspan></text> 27.310 + <text 27.311 + xml:space="preserve" 27.312 + 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" 27.313 + x="82.306923" 27.314 + y="498.97327" 27.315 + id="text3098"><tspan 27.316 + sodipodi:role="line" 27.317 + id="tspan3100" 27.318 + x="82.306923" 27.319 + y="498.97327">Manifest</tspan></text> 27.320 + <text 27.321 + xml:space="preserve" 27.322 + 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" 27.323 + x="82.14286" 27.324 + y="580.08569" 27.325 + id="text3102"><tspan 27.326 + sodipodi:role="line" 27.327 + id="tspan3104" 27.328 + x="82.14286" 27.329 + y="580.08569">Filelogs</tspan></text> 27.330 + </g> 27.331 +</svg>
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/en/images/mq-stack.svg Thu Mar 12 15:58:38 2009 +0800 28.3 @@ -0,0 +1,270 @@ 28.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 28.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 28.6 +<svg 28.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 28.8 + xmlns:cc="http://web.resource.org/cc/" 28.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 28.10 + xmlns:svg="http://www.w3.org/2000/svg" 28.11 + xmlns="http://www.w3.org/2000/svg" 28.12 + xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" 28.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 28.14 + width="744.09448819" 28.15 + height="1052.3622047" 28.16 + id="svg2" 28.17 + sodipodi:version="0.32" 28.18 + inkscape:version="0.43" 28.19 + sodipodi:docname="mq-stack.svg" 28.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 28.21 + <defs 28.22 + id="defs4" /> 28.23 + <sodipodi:namedview 28.24 + id="base" 28.25 + pagecolor="#ffffff" 28.26 + bordercolor="#666666" 28.27 + borderopacity="1.0" 28.28 + inkscape:pageopacity="0.0" 28.29 + inkscape:pageshadow="2" 28.30 + inkscape:zoom="1.4142136" 28.31 + inkscape:cx="299.33323" 28.32 + inkscape:cy="815.646" 28.33 + inkscape:document-units="px" 28.34 + inkscape:current-layer="layer1" 28.35 + inkscape:window-width="1014" 28.36 + inkscape:window-height="689" 28.37 + inkscape:window-x="0" 28.38 + inkscape:window-y="25" /> 28.39 + <metadata 28.40 + id="metadata7"> 28.41 + <rdf:RDF> 28.42 + <cc:Work 28.43 + rdf:about=""> 28.44 + <dc:format>image/svg+xml</dc:format> 28.45 + <dc:type 28.46 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 28.47 + </cc:Work> 28.48 + </rdf:RDF> 28.49 + </metadata> 28.50 + <g 28.51 + inkscape:label="Layer 1" 28.52 + inkscape:groupmode="layer" 28.53 + id="layer1"> 28.54 + <rect 28.55 + style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.56 + id="rect1307" 28.57 + width="202.93683" 28.58 + height="24.243662" 28.59 + x="230.01944" 28.60 + y="221.70146" /> 28.61 + <text 28.62 + xml:space="preserve" 28.63 + 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:Bitstream Vera Sans" 28.64 + x="237.89606" 28.65 + y="237.13383" 28.66 + id="text1309"><tspan 28.67 + sodipodi:role="line" 28.68 + id="tspan1311" 28.69 + x="237.89606" 28.70 + y="237.13383">prevent-compiler-reorder.patch</tspan></text> 28.71 + <rect 28.72 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.73 + id="rect1320" 28.74 + width="202.93683" 28.75 + height="24.243662" 28.76 + x="230.01936" 28.77 + y="251.34325" /> 28.78 + <text 28.79 + xml:space="preserve" 28.80 + 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:Bitstream Vera Sans" 28.81 + x="237.89598" 28.82 + y="266.77563" 28.83 + id="text1322"><tspan 28.84 + sodipodi:role="line" 28.85 + id="tspan1324" 28.86 + x="237.89598" 28.87 + y="266.77563">namespace-cleanup.patch</tspan></text> 28.88 + <rect 28.89 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.90 + id="rect2217" 28.91 + width="202.93683" 28.92 + height="24.243662" 28.93 + x="230.01936" 28.94 + y="280.98505" /> 28.95 + <text 28.96 + xml:space="preserve" 28.97 + 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:Bitstream Vera Sans" 28.98 + x="237.89598" 28.99 + y="296.41742" 28.100 + id="text2219"><tspan 28.101 + sodipodi:role="line" 28.102 + id="tspan2221" 28.103 + x="237.89598" 28.104 + y="296.41742">powerpc-port-fixes.patch</tspan></text> 28.105 + <rect 28.106 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.107 + id="rect3114" 28.108 + width="202.93683" 28.109 + height="24.243662" 28.110 + x="230.01936" 28.111 + y="310.6268" /> 28.112 + <text 28.113 + xml:space="preserve" 28.114 + 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:Bitstream Vera Sans" 28.115 + x="237.89598" 28.116 + y="326.05917" 28.117 + id="text3116"><tspan 28.118 + sodipodi:role="line" 28.119 + id="tspan3118" 28.120 + x="237.89598" 28.121 + y="326.05917">report-devinfo-correctly.patch</tspan></text> 28.122 + <text 28.123 + xml:space="preserve" 28.124 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.125 + x="200.01021" 28.126 + y="191.68094" 28.127 + id="text3170" 28.128 + sodipodi:linespacing="125%"><tspan 28.129 + sodipodi:role="line" 28.130 + id="tspan3172" 28.131 + x="200.01021" 28.132 + y="191.68094" 28.133 + style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 28.134 + <text 28.135 + xml:space="preserve" 28.136 + style="font-size:15.25329685px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.137 + x="255.26627" 28.138 + y="248.79449" 28.139 + id="text3190" 28.140 + sodipodi:linespacing="125%" 28.141 + transform="scale(0.786716,1.271107)"><tspan 28.142 + sodipodi:role="line" 28.143 + id="tspan3192" 28.144 + x="255.26627" 28.145 + y="248.79449" 28.146 + style="font-size:61.01318741px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 28.147 + <text 28.148 + xml:space="preserve" 28.149 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.150 + x="195.86807" 28.151 + y="173.17117" 28.152 + id="text4085" 28.153 + sodipodi:linespacing="125%"><tspan 28.154 + sodipodi:role="line" 28.155 + id="tspan4087" 28.156 + x="195.86807" 28.157 + y="173.17117" 28.158 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">present in series,</tspan><tspan 28.159 + sodipodi:role="line" 28.160 + x="195.86807" 28.161 + y="188.17117" 28.162 + id="tspan4089" 28.163 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">but not applied</tspan></text> 28.164 + <text 28.165 + xml:space="preserve" 28.166 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.167 + x="195.0712" 28.168 + y="288.91745" 28.169 + id="text4091" 28.170 + sodipodi:linespacing="125%"><tspan 28.171 + sodipodi:role="line" 28.172 + id="tspan4093" 28.173 + x="195.0712" 28.174 + y="288.91745" 28.175 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">patches applied,</tspan><tspan 28.176 + sodipodi:role="line" 28.177 + x="195.0712" 28.178 + y="303.91745" 28.179 + id="tspan4111" 28.180 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">changesets present</tspan></text> 28.181 + <text 28.182 + xml:space="preserve" 28.183 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.184 + x="195.0712" 28.185 + y="229.28813" 28.186 + id="text4095" 28.187 + sodipodi:linespacing="125%"><tspan 28.188 + sodipodi:role="line" 28.189 + id="tspan4097" 28.190 + x="195.0712" 28.191 + y="229.28813" 28.192 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">topmost</tspan><tspan 28.193 + sodipodi:role="line" 28.194 + x="195.0712" 28.195 + y="244.28813" 28.196 + id="tspan4109" 28.197 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">applied patch</tspan></text> 28.198 + <text 28.199 + xml:space="preserve" 28.200 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.201 + x="450.4975" 28.202 + y="238.29692" 28.203 + id="text4137"><tspan 28.204 + sodipodi:role="line" 28.205 + id="tspan4139" 28.206 + x="450.4975" 28.207 + y="238.29692">201ad3209902</tspan></text> 28.208 + <text 28.209 + xml:space="preserve" 28.210 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.211 + x="450.05804" 28.212 + y="267.93872" 28.213 + id="text4141"><tspan 28.214 + sodipodi:role="line" 28.215 + id="tspan4143" 28.216 + x="450.05804" 28.217 + y="267.93872">126b84e593ae</tspan></text> 28.218 + <text 28.219 + xml:space="preserve" 28.220 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.221 + x="450.6557" 28.222 + y="297.58051" 28.223 + id="text4145"><tspan 28.224 + sodipodi:role="line" 28.225 + id="tspan4147" 28.226 + x="450.6557" 28.227 + y="297.58051">a655daf15409</tspan></text> 28.228 + <text 28.229 + xml:space="preserve" 28.230 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.231 + x="450.71429" 28.232 + y="327.22226" 28.233 + id="text4149"><tspan 28.234 + sodipodi:role="line" 28.235 + id="tspan4151" 28.236 + x="450.71429" 28.237 + y="327.22226">e50d59aaea3a</tspan></text> 28.238 + <rect 28.239 + style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.240 + id="rect3106" 28.241 + width="202.93683" 28.242 + height="24.243662" 28.243 + x="230.01936" 28.244 + y="150.41792" /> 28.245 + <text 28.246 + xml:space="preserve" 28.247 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.248 + x="237.89598" 28.249 + y="165.8503" 28.250 + id="text3108"><tspan 28.251 + sodipodi:role="line" 28.252 + id="tspan3110" 28.253 + x="237.89598" 28.254 + y="165.8503">forbid-illegal-params.patch</tspan></text> 28.255 + <rect 28.256 + style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 28.257 + id="rect2241" 28.258 + width="202.93683" 28.259 + height="24.243662" 28.260 + x="230.16466" 28.261 + y="180.05968" /> 28.262 + <text 28.263 + xml:space="preserve" 28.264 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 28.265 + x="238.04128" 28.266 + y="195.49205" 28.267 + id="text2243"><tspan 28.268 + sodipodi:role="line" 28.269 + id="tspan2245" 28.270 + x="238.04128" 28.271 + y="195.49205">fix-memory-leak.patch</tspan></text> 28.272 + </g> 28.273 +</svg>
29.1 Binary file en/images/note.png has changed
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/en/images/revlog.svg Thu Mar 12 15:58:38 2009 +0800 30.3 @@ -0,0 +1,1155 @@ 30.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 30.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 30.6 +<svg 30.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 30.8 + xmlns:cc="http://web.resource.org/cc/" 30.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 30.10 + xmlns:svg="http://www.w3.org/2000/svg" 30.11 + xmlns="http://www.w3.org/2000/svg" 30.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 30.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 30.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 30.15 + width="744.09448819" 30.16 + height="1052.3622047" 30.17 + id="svg2" 30.18 + sodipodi:version="0.32" 30.19 + inkscape:version="0.44.1" 30.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 30.21 + sodipodi:docname="revlog.svg"> 30.22 + <defs 30.23 + id="defs4"> 30.24 + <marker 30.25 + inkscape:stockid="Arrow1Mend" 30.26 + orient="auto" 30.27 + refY="0.0" 30.28 + refX="0.0" 30.29 + id="Arrow1Mend" 30.30 + style="overflow:visible;"> 30.31 + <path 30.32 + id="path4852" 30.33 + 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 " 30.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 30.35 + transform="scale(0.4) rotate(180) translate(10,0)" /> 30.36 + </marker> 30.37 + <linearGradient 30.38 + id="linearGradient3092"> 30.39 + <stop 30.40 + style="stop-color:#44436f;stop-opacity:1;" 30.41 + offset="0" 30.42 + id="stop3094" /> 30.43 + <stop 30.44 + style="stop-color:#abade5;stop-opacity:1;" 30.45 + offset="1" 30.46 + id="stop3096" /> 30.47 + </linearGradient> 30.48 + <linearGradient 30.49 + inkscape:collect="always" 30.50 + xlink:href="#linearGradient3092" 30.51 + id="linearGradient3118" 30.52 + gradientUnits="userSpaceOnUse" 30.53 + x1="176.16635" 30.54 + y1="405.21934" 30.55 + x2="417.11935" 30.56 + y2="405.21934" /> 30.57 + <linearGradient 30.58 + inkscape:collect="always" 30.59 + xlink:href="#linearGradient3092" 30.60 + id="linearGradient3120" 30.61 + gradientUnits="userSpaceOnUse" 30.62 + x1="176.16635" 30.63 + y1="405.21934" 30.64 + x2="417.11935" 30.65 + y2="405.21934" /> 30.66 + <linearGradient 30.67 + inkscape:collect="always" 30.68 + xlink:href="#linearGradient3092" 30.69 + id="linearGradient3129" 30.70 + gradientUnits="userSpaceOnUse" 30.71 + x1="176.16635" 30.72 + y1="405.21934" 30.73 + x2="417.11935" 30.74 + y2="405.21934" 30.75 + gradientTransform="translate(-0.928574,-1.428574)" /> 30.76 + <linearGradient 30.77 + inkscape:collect="always" 30.78 + xlink:href="#linearGradient3092" 30.79 + id="linearGradient3133" 30.80 + gradientUnits="userSpaceOnUse" 30.81 + x1="176.16635" 30.82 + y1="405.21934" 30.83 + x2="417.11935" 30.84 + y2="405.21934" 30.85 + gradientTransform="translate(-0.928574,-1.428574)" /> 30.86 + <linearGradient 30.87 + inkscape:collect="always" 30.88 + xlink:href="#linearGradient3092" 30.89 + id="linearGradient3708" 30.90 + gradientUnits="userSpaceOnUse" 30.91 + gradientTransform="matrix(0.423343,0,0,0.423343,138.874,-67.01732)" 30.92 + x1="175.23776" 30.93 + y1="509.98154" 30.94 + x2="416.29077" 30.95 + y2="297.49997" /> 30.96 + <linearGradient 30.97 + inkscape:collect="always" 30.98 + xlink:href="#linearGradient3092" 30.99 + id="linearGradient5164" 30.100 + gradientUnits="userSpaceOnUse" 30.101 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,247.4358)" 30.102 + x1="175.23776" 30.103 + y1="509.98154" 30.104 + x2="416.29077" 30.105 + y2="297.49997" /> 30.106 + <linearGradient 30.107 + inkscape:collect="always" 30.108 + xlink:href="#linearGradient3092" 30.109 + id="linearGradient5584" 30.110 + gradientUnits="userSpaceOnUse" 30.111 + gradientTransform="matrix(0.423343,0,0,0.423343,143.9081,371.2915)" 30.112 + x1="175.23776" 30.113 + y1="509.98154" 30.114 + x2="416.29077" 30.115 + y2="297.49997" /> 30.116 + <linearGradient 30.117 + inkscape:collect="always" 30.118 + xlink:href="#linearGradient3092" 30.119 + id="linearGradient5784" 30.120 + gradientUnits="userSpaceOnUse" 30.121 + gradientTransform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 30.122 + x1="175.23776" 30.123 + y1="509.98154" 30.124 + x2="416.29077" 30.125 + y2="297.49997" /> 30.126 + <linearGradient 30.127 + inkscape:collect="always" 30.128 + xlink:href="#linearGradient3092" 30.129 + id="linearGradient5786" 30.130 + gradientUnits="userSpaceOnUse" 30.131 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,152.137)" 30.132 + x1="175.23776" 30.133 + y1="509.98154" 30.134 + x2="416.29077" 30.135 + y2="297.49997" /> 30.136 + <linearGradient 30.137 + inkscape:collect="always" 30.138 + xlink:href="#linearGradient3092" 30.139 + id="linearGradient5895" 30.140 + gradientUnits="userSpaceOnUse" 30.141 + gradientTransform="matrix(0.423343,0,0,0.423343,198.0215,261.7142)" 30.142 + x1="175.23776" 30.143 + y1="509.98154" 30.144 + x2="416.29077" 30.145 + y2="297.49997" /> 30.146 + <linearGradient 30.147 + inkscape:collect="always" 30.148 + xlink:href="#linearGradient3092" 30.149 + id="linearGradient5958" 30.150 + gradientUnits="userSpaceOnUse" 30.151 + gradientTransform="matrix(0.423343,0,0,0.423343,137.1978,42.55987)" 30.152 + x1="175.23776" 30.153 + y1="509.98154" 30.154 + x2="416.29077" 30.155 + y2="297.49997" /> 30.156 + </defs> 30.157 + <sodipodi:namedview 30.158 + id="base" 30.159 + pagecolor="#ffffff" 30.160 + bordercolor="#666666" 30.161 + borderopacity="1.0" 30.162 + gridtolerance="10000" 30.163 + guidetolerance="10" 30.164 + objecttolerance="10" 30.165 + inkscape:pageopacity="0.0" 30.166 + inkscape:pageshadow="2" 30.167 + inkscape:zoom="0.64" 30.168 + inkscape:cx="566.02368" 30.169 + inkscape:cy="688.16826" 30.170 + inkscape:document-units="px" 30.171 + inkscape:current-layer="layer1" 30.172 + inkscape:window-width="906" 30.173 + inkscape:window-height="620" 30.174 + inkscape:window-x="29" 30.175 + inkscape:window-y="79" 30.176 + inkscape:connector-spacing="11" /> 30.177 + <metadata 30.178 + id="metadata7"> 30.179 + <rdf:RDF> 30.180 + <cc:Work 30.181 + rdf:about=""> 30.182 + <dc:format>image/svg+xml</dc:format> 30.183 + <dc:type 30.184 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 30.185 + </cc:Work> 30.186 + </rdf:RDF> 30.187 + </metadata> 30.188 + <g 30.189 + inkscape:label="Layer 1" 30.190 + inkscape:groupmode="layer" 30.191 + id="layer1"> 30.192 + <rect 30.193 + y="168.74846" 30.194 + x="211.58516" 30.195 + height="89.506805" 30.196 + width="101.60232" 30.197 + id="rect3068" 30.198 + style="fill:url(#linearGradient5958);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.199 + <g 30.200 + id="g3215" 30.201 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55985)"> 30.202 + <rect 30.203 + y="447.71451" 30.204 + x="299.67859" 30.205 + height="48.571426" 30.206 + width="103.14286" 30.207 + id="rect2899" 30.208 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.209 + <text 30.210 + id="text2903" 30.211 + y="464.8139" 30.212 + x="308.89639" 30.213 + 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" 30.214 + xml:space="preserve"><tspan 30.215 + y="464.8139" 30.216 + x="308.89639" 30.217 + sodipodi:role="line" 30.218 + id="tspan2905">Second parent</tspan></text> 30.219 + <text 30.220 + id="text2907" 30.221 + y="485.50256" 30.222 + x="308.20175" 30.223 + 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" 30.224 + xml:space="preserve"><tspan 30.225 + style="font-family:Courier" 30.226 + y="485.50256" 30.227 + x="308.20175" 30.228 + id="tspan2909" 30.229 + sodipodi:role="line">32bf9a5f22c0</tspan></text> 30.230 + </g> 30.231 + <g 30.232 + id="g3250" 30.233 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55986)"> 30.234 + <rect 30.235 + y="311.28598" 30.236 + x="188.6071" 30.237 + height="48.571426" 30.238 + width="103.14286" 30.239 + id="rect2936" 30.240 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.241 + <text 30.242 + id="text2940" 30.243 + y="328.38538" 30.244 + x="197.82495" 30.245 + 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" 30.246 + xml:space="preserve"><tspan 30.247 + y="328.38538" 30.248 + x="197.82495" 30.249 + sodipodi:role="line" 30.250 + id="tspan2942">Revision hash</tspan></text> 30.251 + <text 30.252 + id="text2944" 30.253 + y="349.07404" 30.254 + x="197.13031" 30.255 + 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" 30.256 + xml:space="preserve"><tspan 30.257 + style="font-family:Courier" 30.258 + y="349.07404" 30.259 + x="197.13031" 30.260 + id="tspan2946" 30.261 + sodipodi:role="line">34b8b7a15ea1</tspan></text> 30.262 + </g> 30.263 + <g 30.264 + id="g3243" 30.265 + transform="matrix(0.423343,0,0,0.423343,137.6664,43.91853)"> 30.266 + <rect 30.267 + y="363.07654" 30.268 + x="187.5" 30.269 + height="75" 30.270 + width="213.85715" 30.271 + id="rect2950" 30.272 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.273 + <text 30.274 + id="text2958" 30.275 + y="400.86459" 30.276 + x="196.02321" 30.277 + 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" 30.278 + xml:space="preserve"><tspan 30.279 + style="fill:black;fill-opacity:1;font-family:Courier" 30.280 + y="400.86459" 30.281 + x="196.02321" 30.282 + id="tspan2960" 30.283 + sodipodi:role="line">...</tspan></text> 30.284 + <text 30.285 + id="text2954" 30.286 + y="380.17593" 30.287 + x="196.71785" 30.288 + 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" 30.289 + xml:space="preserve"><tspan 30.290 + y="380.17593" 30.291 + x="196.71785" 30.292 + sodipodi:role="line" 30.293 + id="tspan2956" 30.294 + style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 30.295 + </g> 30.296 + <g 30.297 + id="g5529" 30.298 + transform="translate(-6.710312,-8.165836e-6)"> 30.299 + <rect 30.300 + style="fill:url(#linearGradient5584);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.301 + id="rect3509" 30.302 + width="101.60232" 30.303 + height="89.506805" 30.304 + x="218.29547" 30.305 + y="497.4801" /> 30.306 + <g 30.307 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 30.308 + id="g3513"> 30.309 + <g 30.310 + id="g3515"> 30.311 + <rect 30.312 + y="447.72418" 30.313 + x="188.6071" 30.314 + height="48.571426" 30.315 + width="103.14286" 30.316 + id="rect3517" 30.317 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.318 + <text 30.319 + id="text3519" 30.320 + y="464.82358" 30.321 + x="197.82495" 30.322 + 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" 30.323 + xml:space="preserve"><tspan 30.324 + y="464.82358" 30.325 + x="197.82495" 30.326 + sodipodi:role="line" 30.327 + id="tspan3521">First parent</tspan></text> 30.328 + <text 30.329 + id="text3523" 30.330 + y="485.51224" 30.331 + x="197.13031" 30.332 + 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" 30.333 + xml:space="preserve"><tspan 30.334 + style="font-family:Courier" 30.335 + y="485.51224" 30.336 + x="197.13031" 30.337 + id="tspan3525" 30.338 + sodipodi:role="line">000000000000</tspan></text> 30.339 + </g> 30.340 + <g 30.341 + id="g3527"> 30.342 + <rect 30.343 + y="447.71451" 30.344 + x="299.67859" 30.345 + height="48.571426" 30.346 + width="103.14286" 30.347 + id="rect3529" 30.348 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.349 + <text 30.350 + id="text3531" 30.351 + y="464.8139" 30.352 + x="308.89639" 30.353 + 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" 30.354 + xml:space="preserve"><tspan 30.355 + y="464.8139" 30.356 + x="308.89639" 30.357 + sodipodi:role="line" 30.358 + id="tspan3533">Second parent</tspan></text> 30.359 + <text 30.360 + id="text3535" 30.361 + y="485.50256" 30.362 + x="308.20175" 30.363 + 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" 30.364 + xml:space="preserve"><tspan 30.365 + style="font-family:Courier" 30.366 + y="485.50256" 30.367 + x="308.20175" 30.368 + id="tspan3537" 30.369 + sodipodi:role="line">000000000000</tspan></text> 30.370 + </g> 30.371 + </g> 30.372 + <g 30.373 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 30.374 + id="g3539"> 30.375 + <rect 30.376 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.377 + id="rect3541" 30.378 + width="103.14286" 30.379 + height="48.571426" 30.380 + x="188.6071" 30.381 + y="311.28598" /> 30.382 + <text 30.383 + xml:space="preserve" 30.384 + 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" 30.385 + x="197.82495" 30.386 + y="328.38538" 30.387 + id="text3543"><tspan 30.388 + id="tspan3545" 30.389 + sodipodi:role="line" 30.390 + x="197.82495" 30.391 + y="328.38538">Revision hash</tspan></text> 30.392 + <text 30.393 + xml:space="preserve" 30.394 + 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" 30.395 + x="197.13031" 30.396 + y="349.07404" 30.397 + id="text3547"><tspan 30.398 + sodipodi:role="line" 30.399 + id="tspan3549" 30.400 + x="197.13031" 30.401 + y="349.07404" 30.402 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 30.403 + </g> 30.404 + <g 30.405 + transform="matrix(0.423343,0,0,0.423343,144.3767,372.6502)" 30.406 + id="g3551"> 30.407 + <rect 30.408 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.409 + id="rect3553" 30.410 + width="213.85715" 30.411 + height="75" 30.412 + x="187.5" 30.413 + y="363.07654" /> 30.414 + <text 30.415 + xml:space="preserve" 30.416 + 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" 30.417 + x="196.02321" 30.418 + y="400.86459" 30.419 + id="text3555"><tspan 30.420 + sodipodi:role="line" 30.421 + id="tspan3557" 30.422 + x="196.02321" 30.423 + y="400.86459" 30.424 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 30.425 + <text 30.426 + xml:space="preserve" 30.427 + 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" 30.428 + x="196.71785" 30.429 + y="380.17593" 30.430 + id="text3559"><tspan 30.431 + style="fill:black;fill-opacity:1" 30.432 + id="tspan3561" 30.433 + sodipodi:role="line" 30.434 + x="196.71785" 30.435 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 30.436 + </g> 30.437 + </g> 30.438 + <g 30.439 + id="g4868" 30.440 + transform="translate(-1.676208,-2.342463e-5)"> 30.441 + <rect 30.442 + style="fill:url(#linearGradient3708);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.443 + id="rect3567" 30.444 + width="101.60232" 30.445 + height="89.506805" 30.446 + x="213.26137" 30.447 + y="59.171272" /> 30.448 + <g 30.449 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 30.450 + id="g3573"> 30.451 + <rect 30.452 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.453 + id="rect3575" 30.454 + width="103.14286" 30.455 + height="48.571426" 30.456 + x="188.6071" 30.457 + y="447.72418" /> 30.458 + <text 30.459 + xml:space="preserve" 30.460 + 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" 30.461 + x="197.82495" 30.462 + y="464.82358" 30.463 + id="text3577"><tspan 30.464 + id="tspan3579" 30.465 + sodipodi:role="line" 30.466 + x="197.82495" 30.467 + y="464.82358">First parent</tspan></text> 30.468 + <text 30.469 + xml:space="preserve" 30.470 + 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" 30.471 + x="197.13031" 30.472 + y="485.51224" 30.473 + id="text3581"><tspan 30.474 + sodipodi:role="line" 30.475 + id="tspan3583" 30.476 + x="197.13031" 30.477 + y="485.51224" 30.478 + style="font-family:Courier">34b8b7a15ea1</tspan></text> 30.479 + </g> 30.480 + <g 30.481 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 30.482 + id="g3585"> 30.483 + <rect 30.484 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.485 + id="rect3587" 30.486 + width="103.14286" 30.487 + height="48.571426" 30.488 + x="299.67859" 30.489 + y="447.71451" /> 30.490 + <text 30.491 + xml:space="preserve" 30.492 + 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" 30.493 + x="308.89639" 30.494 + y="464.8139" 30.495 + id="text3589"><tspan 30.496 + id="tspan3591" 30.497 + sodipodi:role="line" 30.498 + x="308.89639" 30.499 + y="464.8139">Second parent</tspan></text> 30.500 + <text 30.501 + xml:space="preserve" 30.502 + 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" 30.503 + x="308.20175" 30.504 + y="485.50256" 30.505 + id="text3593"><tspan 30.506 + sodipodi:role="line" 30.507 + id="tspan3595" 30.508 + x="308.20175" 30.509 + y="485.50256" 30.510 + style="font-family:Courier">000000000000</tspan></text> 30.511 + </g> 30.512 + <g 30.513 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01733)" 30.514 + id="g3597"> 30.515 + <rect 30.516 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.517 + id="rect3599" 30.518 + width="103.14286" 30.519 + height="48.571426" 30.520 + x="188.6071" 30.521 + y="311.28598" /> 30.522 + <text 30.523 + xml:space="preserve" 30.524 + 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" 30.525 + x="197.82495" 30.526 + y="328.38538" 30.527 + id="text3601"><tspan 30.528 + id="tspan3603" 30.529 + sodipodi:role="line" 30.530 + x="197.82495" 30.531 + y="328.38538">Revision hash</tspan></text> 30.532 + <text 30.533 + xml:space="preserve" 30.534 + 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" 30.535 + x="197.13031" 30.536 + y="349.07404" 30.537 + id="text3605"><tspan 30.538 + sodipodi:role="line" 30.539 + id="tspan3607" 30.540 + x="197.13031" 30.541 + y="349.07404" 30.542 + style="font-family:Courier">1b67dc96f27a</tspan></text> 30.543 + </g> 30.544 + <g 30.545 + transform="matrix(0.423343,0,0,0.423343,139.3426,-65.65866)" 30.546 + id="g3609"> 30.547 + <rect 30.548 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.549 + id="rect3611" 30.550 + width="213.85715" 30.551 + height="75" 30.552 + x="187.5" 30.553 + y="363.07654" /> 30.554 + <text 30.555 + xml:space="preserve" 30.556 + 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" 30.557 + x="196.02321" 30.558 + y="400.86459" 30.559 + id="text3613"><tspan 30.560 + sodipodi:role="line" 30.561 + id="tspan3615" 30.562 + x="196.02321" 30.563 + y="400.86459" 30.564 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 30.565 + <text 30.566 + xml:space="preserve" 30.567 + 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" 30.568 + x="196.71785" 30.569 + y="380.17593" 30.570 + id="text3617"><tspan 30.571 + style="fill:black;fill-opacity:1" 30.572 + id="tspan3619" 30.573 + sodipodi:role="line" 30.574 + x="196.71785" 30.575 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 30.576 + </g> 30.577 + </g> 30.578 + <path 30.579 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow1Mend)" 30.580 + d="M 240.78255,143.08593 L 241.42595,171.75349" 30.581 + id="path3801" 30.582 + inkscape:connector-type="polyline" 30.583 + inkscape:connection-start="#g3573" 30.584 + inkscape:connection-end="#g3250" /> 30.585 + <g 30.586 + id="g5677"> 30.587 + <rect 30.588 + style="fill:url(#linearGradient5784);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.589 + id="rect3393" 30.590 + width="101.60232" 30.591 + height="89.506805" 30.592 + x="150.76137" 30.593 + y="278.32565" /> 30.594 + <g 30.595 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 30.596 + id="g3399"> 30.597 + <rect 30.598 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.599 + id="rect3401" 30.600 + width="103.14286" 30.601 + height="48.571426" 30.602 + x="188.6071" 30.603 + y="447.72418" /> 30.604 + <text 30.605 + xml:space="preserve" 30.606 + 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" 30.607 + x="197.82495" 30.608 + y="464.82358" 30.609 + id="text3403"><tspan 30.610 + id="tspan3405" 30.611 + sodipodi:role="line" 30.612 + x="197.82495" 30.613 + y="464.82358">First parent</tspan></text> 30.614 + <text 30.615 + xml:space="preserve" 30.616 + 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" 30.617 + x="197.13031" 30.618 + y="485.51224" 30.619 + id="text3407"><tspan 30.620 + sodipodi:role="line" 30.621 + id="tspan3409" 30.622 + x="197.13031" 30.623 + y="485.51224" 30.624 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 30.625 + </g> 30.626 + <g 30.627 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 30.628 + id="g3411"> 30.629 + <rect 30.630 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.631 + id="rect3413" 30.632 + width="103.14286" 30.633 + height="48.571426" 30.634 + x="299.67859" 30.635 + y="447.71451" /> 30.636 + <text 30.637 + xml:space="preserve" 30.638 + 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" 30.639 + x="308.89639" 30.640 + y="464.8139" 30.641 + id="text3415"><tspan 30.642 + id="tspan3417" 30.643 + sodipodi:role="line" 30.644 + x="308.89639" 30.645 + y="464.8139">Second parent</tspan></text> 30.646 + <text 30.647 + xml:space="preserve" 30.648 + 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" 30.649 + x="308.20175" 30.650 + y="485.50256" 30.651 + id="text3419"><tspan 30.652 + sodipodi:role="line" 30.653 + id="tspan3421" 30.654 + x="308.20175" 30.655 + y="485.50256" 30.656 + style="font-family:Courier">000000000000</tspan></text> 30.657 + </g> 30.658 + <g 30.659 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 30.660 + id="g3423"> 30.661 + <rect 30.662 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.663 + id="rect3425" 30.664 + width="103.14286" 30.665 + height="48.571426" 30.666 + x="188.6071" 30.667 + y="311.28598" /> 30.668 + <text 30.669 + xml:space="preserve" 30.670 + 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" 30.671 + x="197.82495" 30.672 + y="328.38538" 30.673 + id="text3427"><tspan 30.674 + id="tspan3429" 30.675 + sodipodi:role="line" 30.676 + x="197.82495" 30.677 + y="328.38538">Revision hash</tspan></text> 30.678 + <text 30.679 + xml:space="preserve" 30.680 + 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" 30.681 + x="197.13031" 30.682 + y="349.07404" 30.683 + id="text3431"><tspan 30.684 + sodipodi:role="line" 30.685 + id="tspan3433" 30.686 + x="197.13031" 30.687 + y="349.07404" 30.688 + style="font-family:Courier">5b80c922ebdd</tspan></text> 30.689 + </g> 30.690 + <g 30.691 + transform="matrix(0.423343,0,0,0.423343,76.84265,153.4957)" 30.692 + id="g3435"> 30.693 + <rect 30.694 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.695 + id="rect3437" 30.696 + width="213.85715" 30.697 + height="75" 30.698 + x="187.5" 30.699 + y="363.07654" /> 30.700 + <text 30.701 + xml:space="preserve" 30.702 + 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" 30.703 + x="196.02321" 30.704 + y="400.86459" 30.705 + id="text3439"><tspan 30.706 + sodipodi:role="line" 30.707 + id="tspan3441" 30.708 + x="196.02321" 30.709 + y="400.86459" 30.710 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 30.711 + <text 30.712 + xml:space="preserve" 30.713 + 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" 30.714 + x="196.71785" 30.715 + y="380.17593" 30.716 + id="text3443"><tspan 30.717 + style="fill:black;fill-opacity:1" 30.718 + id="tspan3445" 30.719 + sodipodi:role="line" 30.720 + x="196.71785" 30.721 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 30.722 + </g> 30.723 + </g> 30.724 + <g 30.725 + id="g5646" 30.726 + transform="translate(-0.227432,0)"> 30.727 + <rect 30.728 + style="fill:url(#linearGradient5786);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.729 + id="rect3451" 30.730 + width="101.60232" 30.731 + height="89.506805" 30.732 + x="272.63638" 30.733 + y="278.32565" /> 30.734 + <g 30.735 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 30.736 + id="g3457"> 30.737 + <rect 30.738 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.739 + id="rect3459" 30.740 + width="103.14286" 30.741 + height="48.571426" 30.742 + x="188.6071" 30.743 + y="447.72418" /> 30.744 + <text 30.745 + xml:space="preserve" 30.746 + 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" 30.747 + x="197.82495" 30.748 + y="464.82358" 30.749 + id="text3461"><tspan 30.750 + id="tspan3463" 30.751 + sodipodi:role="line" 30.752 + x="197.82495" 30.753 + y="464.82358">First parent</tspan></text> 30.754 + <text 30.755 + xml:space="preserve" 30.756 + 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" 30.757 + x="197.13031" 30.758 + y="485.51224" 30.759 + id="text3465"><tspan 30.760 + sodipodi:role="line" 30.761 + id="tspan3467" 30.762 + x="197.13031" 30.763 + y="485.51224" 30.764 + style="font-family:Courier">ecacb6b4c9fd</tspan></text> 30.765 + </g> 30.766 + <g 30.767 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 30.768 + id="g3469"> 30.769 + <rect 30.770 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.771 + id="rect3471" 30.772 + width="103.14286" 30.773 + height="48.571426" 30.774 + x="299.67859" 30.775 + y="447.71451" /> 30.776 + <text 30.777 + xml:space="preserve" 30.778 + 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" 30.779 + x="308.89639" 30.780 + y="464.8139" 30.781 + id="text3473"><tspan 30.782 + id="tspan3475" 30.783 + sodipodi:role="line" 30.784 + x="308.89639" 30.785 + y="464.8139">Second parent</tspan></text> 30.786 + <text 30.787 + xml:space="preserve" 30.788 + 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" 30.789 + x="308.20175" 30.790 + y="485.50256" 30.791 + id="text3477"><tspan 30.792 + sodipodi:role="line" 30.793 + id="tspan3479" 30.794 + x="308.20175" 30.795 + y="485.50256" 30.796 + style="font-family:Courier">000000000000</tspan></text> 30.797 + </g> 30.798 + <g 30.799 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 30.800 + id="g3481"> 30.801 + <rect 30.802 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.803 + id="rect3483" 30.804 + width="103.14286" 30.805 + height="48.571426" 30.806 + x="188.6071" 30.807 + y="311.28598" /> 30.808 + <text 30.809 + xml:space="preserve" 30.810 + 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" 30.811 + x="197.82495" 30.812 + y="328.38538" 30.813 + id="text3485"><tspan 30.814 + id="tspan3487" 30.815 + sodipodi:role="line" 30.816 + x="197.82495" 30.817 + y="328.38538">Revision hash</tspan></text> 30.818 + <text 30.819 + xml:space="preserve" 30.820 + 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" 30.821 + x="197.13031" 30.822 + y="349.07404" 30.823 + id="text3489"><tspan 30.824 + sodipodi:role="line" 30.825 + id="tspan3491" 30.826 + x="197.13031" 30.827 + y="349.07404" 30.828 + style="font-family:Courier">32bf9a5f22c0</tspan></text> 30.829 + </g> 30.830 + <g 30.831 + transform="matrix(0.423343,0,0,0.423343,198.7176,153.4957)" 30.832 + id="g3493"> 30.833 + <rect 30.834 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.835 + id="rect3495" 30.836 + width="213.85715" 30.837 + height="75" 30.838 + x="187.5" 30.839 + y="363.07654" /> 30.840 + <text 30.841 + xml:space="preserve" 30.842 + 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" 30.843 + x="196.02321" 30.844 + y="400.86459" 30.845 + id="text3497"><tspan 30.846 + sodipodi:role="line" 30.847 + id="tspan3499" 30.848 + x="196.02321" 30.849 + y="400.86459" 30.850 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 30.851 + <text 30.852 + xml:space="preserve" 30.853 + 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" 30.854 + x="196.71785" 30.855 + y="380.17593" 30.856 + id="text3501"><tspan 30.857 + style="fill:black;fill-opacity:1" 30.858 + id="tspan3503" 30.859 + sodipodi:role="line" 30.860 + x="196.71785" 30.861 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 30.862 + </g> 30.863 + </g> 30.864 + <rect 30.865 + y="387.90286" 30.866 + x="272.40894" 30.867 + height="89.506805" 30.868 + width="101.60232" 30.869 + id="rect5081" 30.870 + style="fill:url(#linearGradient5895);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.871 + <g 30.872 + id="g5087" 30.873 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 30.874 + <rect 30.875 + y="447.72418" 30.876 + x="188.6071" 30.877 + height="48.571426" 30.878 + width="103.14286" 30.879 + id="rect5089" 30.880 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.881 + <text 30.882 + id="text5091" 30.883 + y="464.82358" 30.884 + x="197.82495" 30.885 + 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" 30.886 + xml:space="preserve"><tspan 30.887 + y="464.82358" 30.888 + x="197.82495" 30.889 + sodipodi:role="line" 30.890 + id="tspan5093">First parent</tspan></text> 30.891 + <text 30.892 + id="text5095" 30.893 + y="485.51224" 30.894 + x="197.13031" 30.895 + 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" 30.896 + xml:space="preserve"><tspan 30.897 + style="font-family:Courier" 30.898 + y="485.51224" 30.899 + x="197.13031" 30.900 + id="tspan5097" 30.901 + sodipodi:role="line">ff9dc8bc2a8b</tspan></text> 30.902 + </g> 30.903 + <g 30.904 + id="g5099" 30.905 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 30.906 + <rect 30.907 + y="447.71451" 30.908 + x="299.67859" 30.909 + height="48.571426" 30.910 + width="103.14286" 30.911 + id="rect5101" 30.912 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.913 + <text 30.914 + id="text5103" 30.915 + y="464.8139" 30.916 + x="308.89639" 30.917 + 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" 30.918 + xml:space="preserve"><tspan 30.919 + y="464.8139" 30.920 + x="308.89639" 30.921 + sodipodi:role="line" 30.922 + id="tspan5105">Second parent</tspan></text> 30.923 + <text 30.924 + id="text5107" 30.925 + y="485.50256" 30.926 + x="308.20175" 30.927 + 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" 30.928 + xml:space="preserve"><tspan 30.929 + style="font-family:Courier" 30.930 + y="485.50256" 30.931 + x="308.20175" 30.932 + id="tspan5109" 30.933 + sodipodi:role="line">000000000000</tspan></text> 30.934 + </g> 30.935 + <g 30.936 + id="g5111" 30.937 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 30.938 + <rect 30.939 + y="311.28598" 30.940 + x="188.6071" 30.941 + height="48.571426" 30.942 + width="103.14286" 30.943 + id="rect5113" 30.944 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.945 + <text 30.946 + id="text5115" 30.947 + y="328.38538" 30.948 + x="197.82495" 30.949 + 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" 30.950 + xml:space="preserve"><tspan 30.951 + y="328.38538" 30.952 + x="197.82495" 30.953 + sodipodi:role="line" 30.954 + id="tspan5117">Revision hash</tspan></text> 30.955 + <text 30.956 + id="text5119" 30.957 + y="349.07404" 30.958 + x="197.13031" 30.959 + 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" 30.960 + xml:space="preserve"><tspan 30.961 + style="font-family:Courier" 30.962 + y="349.07404" 30.963 + x="197.13031" 30.964 + id="tspan5121" 30.965 + sodipodi:role="line">ecacb6b4c9fd</tspan></text> 30.966 + </g> 30.967 + <g 30.968 + id="g5123" 30.969 + transform="matrix(0.423343,0,0,0.423343,198.4901,263.0729)"> 30.970 + <rect 30.971 + y="363.07654" 30.972 + x="187.5" 30.973 + height="75" 30.974 + width="213.85715" 30.975 + id="rect5125" 30.976 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 30.977 + <text 30.978 + id="text5127" 30.979 + y="400.86459" 30.980 + x="196.02321" 30.981 + 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" 30.982 + xml:space="preserve"><tspan 30.983 + style="fill:black;fill-opacity:1;font-family:Courier" 30.984 + y="400.86459" 30.985 + x="196.02321" 30.986 + id="tspan5129" 30.987 + sodipodi:role="line">...</tspan></text> 30.988 + <text 30.989 + id="text5131" 30.990 + y="380.17593" 30.991 + x="196.71785" 30.992 + 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" 30.993 + xml:space="preserve"><tspan 30.994 + y="380.17593" 30.995 + x="196.71785" 30.996 + sodipodi:role="line" 30.997 + id="tspan5133" 30.998 + style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 30.999 + </g> 30.1000 + <path 30.1001 + 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;display:inline" 30.1002 + d="M 299.69935,362.24027 L 299.69931,393.49494" 30.1003 + id="path5203" 30.1004 + inkscape:connector-type="polyline" 30.1005 + inkscape:connection-start="#g3457" 30.1006 + inkscape:connection-end="#g5111" /> 30.1007 + <path 30.1008 + 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" 30.1009 + d="M 182.35357,362.22647 L 241.2842,503.07224" 30.1010 + id="path5271" 30.1011 + inkscape:connector-type="polyline" 30.1012 + inkscape:connection-start="#g3399" 30.1013 + inkscape:connection-end="#g3539" /> 30.1014 + <path 30.1015 + 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;display:inline" 30.1016 + d="M 287.63109,471.81747 L 250.9438,503.07223" 30.1017 + id="path5285" 30.1018 + inkscape:connector-type="polyline" 30.1019 + inkscape:connection-start="#g5087" 30.1020 + inkscape:connection-end="#g3539" /> 30.1021 + <path 30.1022 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 30.1023 + d="M 290.80419,250.07192 L 297.80065,283.90394" 30.1024 + id="path5077" 30.1025 + inkscape:connector-type="polyline" 30.1026 + inkscape:connection-start="#g3215" 30.1027 + inkscape:connection-end="#g3481" /> 30.1028 + <path 30.1029 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 30.1030 + d="M 229.63373,250.07601 L 190.07484,283.90394" 30.1031 + id="path5075" 30.1032 + inkscape:connector-type="polyline" 30.1033 + inkscape:connection-end="#g3423" /> 30.1034 + <text 30.1035 + xml:space="preserve" 30.1036 + 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" 30.1037 + x="131.5625" 30.1038 + y="100.79968" 30.1039 + id="text5897"><tspan 30.1040 + sodipodi:role="line" 30.1041 + id="tspan5899" 30.1042 + x="131.5625" 30.1043 + y="100.79968" 30.1044 + style="text-align:end;text-anchor:end">Head revision</tspan><tspan 30.1045 + sodipodi:role="line" 30.1046 + x="131.5625" 30.1047 + y="115.79968" 30.1048 + id="tspan5901" 30.1049 + style="text-align:end;text-anchor:end">(no children)</tspan></text> 30.1050 + <text 30.1051 + xml:space="preserve" 30.1052 + 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" 30.1053 + x="131.5625" 30.1054 + y="207.04968" 30.1055 + id="text5903"><tspan 30.1056 + sodipodi:role="line" 30.1057 + id="tspan5905" 30.1058 + x="131.5625" 30.1059 + y="207.04968" 30.1060 + style="text-align:end;text-anchor:end">Merge revision</tspan><tspan 30.1061 + sodipodi:role="line" 30.1062 + x="131.5625" 30.1063 + y="222.04968" 30.1064 + id="tspan5907" 30.1065 + style="text-align:end;text-anchor:end">(two parents)</tspan></text> 30.1066 + <text 30.1067 + xml:space="preserve" 30.1068 + 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" 30.1069 + x="131.92578" 30.1070 + y="451.58093" 30.1071 + id="text5909"><tspan 30.1072 + sodipodi:role="line" 30.1073 + id="tspan5911" 30.1074 + x="131.92578" 30.1075 + y="451.58093" 30.1076 + style="text-align:end;text-anchor:end">Branches</tspan><tspan 30.1077 + sodipodi:role="line" 30.1078 + x="131.92578" 30.1079 + y="466.58093" 30.1080 + id="tspan5913" 30.1081 + style="text-align:end;text-anchor:end">(two revisions,</tspan><tspan 30.1082 + sodipodi:role="line" 30.1083 + x="131.92578" 30.1084 + y="481.58093" 30.1085 + id="tspan5915" 30.1086 + style="text-align:end;text-anchor:end">same parent)</tspan></text> 30.1087 + <path 30.1088 + 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 30.1089 + d="M 111.71875,433.61218 L 154.7268,368.52294" 30.1090 + id="path5917" 30.1091 + inkscape:connector-type="polyline" /> 30.1092 + <path 30.1093 + 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 30.1094 + d="M 134.375,464.86218 L 277.86691,440.37816" 30.1095 + id="path5919" 30.1096 + inkscape:connector-type="polyline" 30.1097 + inkscape:connection-end="#g5123" /> 30.1098 + <text 30.1099 + xml:space="preserve" 30.1100 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:end;text-anchor:end;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 30.1101 + x="131.5625" 30.1102 + y="536.73718" 30.1103 + id="text5927"><tspan 30.1104 + sodipodi:role="line" 30.1105 + id="tspan5929" 30.1106 + x="131.5625" 30.1107 + y="536.73718">First revision</tspan><tspan 30.1108 + sodipodi:role="line" 30.1109 + x="131.5625" 30.1110 + y="551.73718" 30.1111 + id="tspan5931">(both parents null)</tspan></text> 30.1112 + <rect 30.1113 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 30.1114 + id="rect2830" 30.1115 + width="43.664806" 30.1116 + height="20.562374" 30.1117 + x="217.0432" 30.1118 + y="232.10075" /> 30.1119 + <text 30.1120 + xml:space="preserve" 30.1121 + style="font-size:5.0801158px;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" 30.1122 + x="220.94551" 30.1123 + y="239.33966" 30.1124 + id="text2832"><tspan 30.1125 + id="tspan2836" 30.1126 + sodipodi:role="line" 30.1127 + x="220.94551" 30.1128 + y="239.33966">First parent</tspan></text> 30.1129 + <text 30.1130 + xml:space="preserve" 30.1131 + style="font-size:5.0801158px;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" 30.1132 + x="220.65144" 30.1133 + y="248.09805" 30.1134 + id="text2879"><tspan 30.1135 + sodipodi:role="line" 30.1136 + id="tspan2881" 30.1137 + x="220.65144" 30.1138 + y="248.09805" 30.1139 + style="font-family:Courier">5b80c922ebdd</tspan></text> 30.1140 + <path 30.1141 + 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 30.1142 + d="M 139.84375,107.83093 L 210.15625,107.83093" 30.1143 + id="path5965" 30.1144 + inkscape:connector-type="polyline" /> 30.1145 + <path 30.1146 + 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 30.1147 + d="M 137.5,213.29968 L 210.49036,214.09055" 30.1148 + id="path5967" 30.1149 + inkscape:connector-type="polyline" /> 30.1150 + <path 30.1151 + 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, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 30.1152 + d="M 136.34375,544.54968 L 206.65625,544.54968" 30.1153 + id="path5969" 30.1154 + inkscape:connector-type="polyline" 30.1155 + inkscape:transform-center-y="-171.09375" 30.1156 + inkscape:transform-center-x="53.90625" /> 30.1157 + </g> 30.1158 +</svg>
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/en/images/snapshot.svg Thu Mar 12 15:58:38 2009 +0800 31.3 @@ -0,0 +1,202 @@ 31.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 31.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 31.6 +<svg 31.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 31.8 + xmlns:cc="http://web.resource.org/cc/" 31.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 31.10 + xmlns:svg="http://www.w3.org/2000/svg" 31.11 + xmlns="http://www.w3.org/2000/svg" 31.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 31.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 31.14 + width="744.09448819" 31.15 + height="1052.3622047" 31.16 + id="svg2807" 31.17 + sodipodi:version="0.32" 31.18 + inkscape:version="0.44.1" 31.19 + sodipodi:docbase="/home/bos/hg/hgbook/en" 31.20 + sodipodi:docname="snapshots.svg"> 31.21 + <defs 31.22 + id="defs2809" /> 31.23 + <sodipodi:namedview 31.24 + id="base" 31.25 + pagecolor="#ffffff" 31.26 + bordercolor="#666666" 31.27 + borderopacity="1.0" 31.28 + gridtolerance="10000" 31.29 + guidetolerance="10" 31.30 + objecttolerance="10" 31.31 + inkscape:pageopacity="0.0" 31.32 + inkscape:pageshadow="2" 31.33 + inkscape:zoom="1.4" 31.34 + inkscape:cx="252.04111" 31.35 + inkscape:cy="605.75448" 31.36 + inkscape:document-units="px" 31.37 + inkscape:current-layer="layer1" 31.38 + inkscape:window-width="906" 31.39 + inkscape:window-height="721" 31.40 + inkscape:window-x="0" 31.41 + inkscape:window-y="25" /> 31.42 + <metadata 31.43 + id="metadata2812"> 31.44 + <rdf:RDF> 31.45 + <cc:Work 31.46 + rdf:about=""> 31.47 + <dc:format>image/svg+xml</dc:format> 31.48 + <dc:type 31.49 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 31.50 + </cc:Work> 31.51 + </rdf:RDF> 31.52 + </metadata> 31.53 + <g 31.54 + inkscape:label="Layer 1" 31.55 + inkscape:groupmode="layer" 31.56 + id="layer1"> 31.57 + <rect 31.58 + style="opacity:1;fill:#d3ceff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.88795626;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.59 + id="rect2817" 31.60 + width="118.18347" 31.61 + height="245.32632" 31.62 + x="243.05112" 31.63 + y="315.4133" 31.64 + inkscape:transform-center-x="136.84403" 31.65 + inkscape:transform-center-y="-66.529183" /> 31.66 + <rect 31.67 + y="315.04153" 31.68 + x="46.965065" 31.69 + height="97.803009" 31.70 + width="108.92702" 31.71 + id="rect2815" 31.72 + style="fill:#ffced6;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.14441991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 31.73 + <g 31.74 + id="g3814"> 31.75 + <rect 31.76 + y="348.94302" 31.77 + x="59.285713" 31.78 + height="30" 31.79 + width="84.285713" 31.80 + id="rect2819" 31.81 + style="fill:#ff6e86;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.82 + ry="0" /> 31.83 + <text 31.84 + id="text2821" 31.85 + y="368.02701" 31.86 + x="72.717636" 31.87 + 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" 31.88 + xml:space="preserve"><tspan 31.89 + y="368.02701" 31.90 + x="72.717636" 31.91 + id="tspan2823" 31.92 + sodipodi:role="line">Index, rev 7</tspan></text> 31.93 + </g> 31.94 + <text 31.95 + id="text3722" 31.96 + y="301.29074" 31.97 + x="46.187778" 31.98 + 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" 31.99 + xml:space="preserve"><tspan 31.100 + y="301.29074" 31.101 + x="46.187778" 31.102 + id="tspan3724" 31.103 + sodipodi:role="line">Revlog index (.i file)</tspan></text> 31.104 + <text 31.105 + id="text3726" 31.106 + y="301.29074" 31.107 + x="241.90207" 31.108 + 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" 31.109 + xml:space="preserve"><tspan 31.110 + y="301.29074" 31.111 + x="241.90207" 31.112 + id="tspan3728" 31.113 + sodipodi:role="line">Revlog data (.d file)</tspan></text> 31.114 + <path 31.115 + style="fill:#c695ff;fill-opacity:0.60109288;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 31.116 + d="M 143.57143,348.07647 L 255,368.07646 L 255.71429,544.50504 L 142.85714,379.50504 L 143.57143,348.07647 z " 31.117 + id="path3839" 31.118 + sodipodi:nodetypes="ccccc" /> 31.119 + <rect 31.120 + style="fill:#4733ff;fill-opacity:1;stroke:#a7a7a7;stroke-width:2.35124183;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.121 + id="rect3752" 31.122 + width="92.720184" 31.123 + height="67.005905" 31.124 + x="255.42564" 31.125 + y="368.64264" /> 31.126 + <text 31.127 + xml:space="preserve" 31.128 + 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" 31.129 + x="264.45859" 31.130 + y="387.30099" 31.131 + id="text3754"><tspan 31.132 + sodipodi:role="line" 31.133 + id="tspan3756" 31.134 + x="264.45859" 31.135 + y="387.30099">Snapshot, rev 4</tspan></text> 31.136 + <rect 31.137 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.138 + id="rect3761" 31.139 + width="93.49366" 31.140 + height="29.922237" 31.141 + x="255.03891" 31.142 + y="442.04395" /> 31.143 + <text 31.144 + xml:space="preserve" 31.145 + 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" 31.146 + x="263.2662" 31.147 + y="460.17206" 31.148 + id="text3763"><tspan 31.149 + sodipodi:role="line" 31.150 + id="tspan3765" 31.151 + x="263.2662" 31.152 + y="460.17206">Delta, rev 4 to 5</tspan></text> 31.153 + <rect 31.154 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.155 + id="rect3774" 31.156 + width="93.49366" 31.157 + height="29.922237" 31.158 + x="255.03891" 31.159 + y="477.97485" /> 31.160 + <text 31.161 + xml:space="preserve" 31.162 + 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" 31.163 + x="263.2662" 31.164 + y="496.10297" 31.165 + id="text3776"><tspan 31.166 + sodipodi:role="line" 31.167 + id="tspan3778" 31.168 + x="263.2662" 31.169 + y="496.10297">Delta, rev 5 to 6</tspan></text> 31.170 + <rect 31.171 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.172 + id="rect3782" 31.173 + width="93.49366" 31.174 + height="29.922237" 31.175 + x="255.03891" 31.176 + y="513.90576" /> 31.177 + <text 31.178 + xml:space="preserve" 31.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" 31.180 + x="263.2662" 31.181 + y="532.03387" 31.182 + id="text3784"><tspan 31.183 + sodipodi:role="line" 31.184 + id="tspan3786" 31.185 + x="263.2662" 31.186 + y="532.03387">Delta, rev 6 to 7</tspan></text> 31.187 + <rect 31.188 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 31.189 + id="rect3889" 31.190 + width="93.49366" 31.191 + height="29.922237" 31.192 + x="255.03891" 31.193 + y="332.32489" /> 31.194 + <text 31.195 + xml:space="preserve" 31.196 + 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" 31.197 + x="263.2662" 31.198 + y="350.453" 31.199 + id="text3891"><tspan 31.200 + sodipodi:role="line" 31.201 + id="tspan3893" 31.202 + x="263.2662" 31.203 + y="350.453">Delta, rev 2 to 3</tspan></text> 31.204 + </g> 31.205 +</svg>
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/en/images/tour-history.svg Thu Mar 12 15:58:38 2009 +0800 32.3 @@ -0,0 +1,289 @@ 32.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 32.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 32.6 +<svg 32.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 32.8 + xmlns:cc="http://web.resource.org/cc/" 32.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 32.10 + xmlns:svg="http://www.w3.org/2000/svg" 32.11 + xmlns="http://www.w3.org/2000/svg" 32.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 32.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 32.14 + width="744.09448819" 32.15 + height="1052.3622047" 32.16 + id="svg2" 32.17 + sodipodi:version="0.32" 32.18 + inkscape:version="0.44.1" 32.19 + sodipodi:docname="tour-history.svg"> 32.20 + <defs 32.21 + id="defs4"> 32.22 + <marker 32.23 + inkscape:stockid="Arrow1Mstart" 32.24 + orient="auto" 32.25 + refY="0.0" 32.26 + refX="0.0" 32.27 + id="Arrow1Mstart" 32.28 + style="overflow:visible"> 32.29 + <path 32.30 + id="path2973" 32.31 + 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 " 32.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 32.33 + transform="scale(0.4) translate(10,0)" /> 32.34 + </marker> 32.35 + <marker 32.36 + inkscape:stockid="Arrow1Mend" 32.37 + orient="auto" 32.38 + refY="0.0" 32.39 + refX="0.0" 32.40 + id="Arrow1Mend" 32.41 + style="overflow:visible;"> 32.42 + <path 32.43 + id="path3066" 32.44 + 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 " 32.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 32.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 32.47 + </marker> 32.48 + </defs> 32.49 + <sodipodi:namedview 32.50 + id="base" 32.51 + pagecolor="#ffffff" 32.52 + bordercolor="#666666" 32.53 + borderopacity="1.0" 32.54 + gridtolerance="10000" 32.55 + guidetolerance="10" 32.56 + objecttolerance="10" 32.57 + inkscape:pageopacity="0.0" 32.58 + inkscape:pageshadow="2" 32.59 + inkscape:zoom="1.4" 32.60 + inkscape:cx="232.14286" 32.61 + inkscape:cy="672.75296" 32.62 + inkscape:document-units="px" 32.63 + inkscape:current-layer="layer1" 32.64 + inkscape:window-width="906" 32.65 + inkscape:window-height="620" 32.66 + inkscape:window-x="5" 32.67 + inkscape:window-y="49" /> 32.68 + <metadata 32.69 + id="metadata7"> 32.70 + <rdf:RDF> 32.71 + <cc:Work 32.72 + rdf:about=""> 32.73 + <dc:format>image/svg+xml</dc:format> 32.74 + <dc:type 32.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 32.76 + </cc:Work> 32.77 + </rdf:RDF> 32.78 + </metadata> 32.79 + <g 32.80 + inkscape:label="Layer 1" 32.81 + inkscape:groupmode="layer" 32.82 + id="layer1"> 32.83 + <rect 32.84 + style="opacity:1;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" 32.85 + id="rect1878" 32.86 + width="94.285713" 32.87 + height="20.714285" 32.88 + x="138" 32.89 + y="479.50504" /> 32.90 + <text 32.91 + xml:space="preserve" 32.92 + 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" 32.93 + x="162.09892" 32.94 + y="493.12619" 32.95 + id="text1872"><tspan 32.96 + sodipodi:role="line" 32.97 + id="tspan1874" 32.98 + x="162.09892" 32.99 + y="493.12619" 32.100 + style="font-family:Courier"><tspan 32.101 + style="font-weight:bold" 32.102 + id="tspan1876">0</tspan>: REV0</tspan></text> 32.103 + <rect 32.104 + style="opacity:1;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" 32.105 + id="rect2800" 32.106 + width="94.285713" 32.107 + height="20.714285" 32.108 + x="138" 32.109 + y="432.63004" /> 32.110 + <text 32.111 + xml:space="preserve" 32.112 + 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" 32.113 + x="162.09892" 32.114 + y="446.25119" 32.115 + id="text2794"><tspan 32.116 + sodipodi:role="line" 32.117 + id="tspan2796" 32.118 + x="162.09892" 32.119 + y="446.25119" 32.120 + style="font-family:Courier"><tspan 32.121 + id="tspan2868" 32.122 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 32.123 + <rect 32.124 + style="opacity:1;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" 32.125 + id="rect2810" 32.126 + width="94.285713" 32.127 + height="20.714285" 32.128 + x="138" 32.129 + y="385.75504" /> 32.130 + <text 32.131 + xml:space="preserve" 32.132 + 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" 32.133 + x="162.09892" 32.134 + y="399.37619" 32.135 + id="text2804"><tspan 32.136 + sodipodi:role="line" 32.137 + id="tspan2806" 32.138 + x="162.09892" 32.139 + y="399.37619" 32.140 + style="font-family:Courier"><tspan 32.141 + style="font-weight:bold" 32.142 + id="tspan2866">2</tspan>: REV2</tspan></text> 32.143 + <rect 32.144 + style="opacity:1;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" 32.145 + id="rect2820" 32.146 + width="94.285713" 32.147 + height="20.714285" 32.148 + x="138" 32.149 + y="338.88007" /> 32.150 + <text 32.151 + xml:space="preserve" 32.152 + 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" 32.153 + x="162.09892" 32.154 + y="352.50122" 32.155 + id="text2814"><tspan 32.156 + sodipodi:role="line" 32.157 + id="tspan2816" 32.158 + x="162.09892" 32.159 + y="352.50122" 32.160 + style="font-family:Courier"><tspan 32.161 + style="font-weight:bold" 32.162 + id="tspan2864">3</tspan>: REV3</tspan></text> 32.163 + <rect 32.164 + style="opacity:1;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" 32.165 + id="rect2830" 32.166 + width="94.285713" 32.167 + height="20.714285" 32.168 + x="138" 32.169 + y="292.00504" /> 32.170 + <text 32.171 + xml:space="preserve" 32.172 + 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" 32.173 + x="162.09892" 32.174 + y="305.62619" 32.175 + id="text2824"><tspan 32.176 + sodipodi:role="line" 32.177 + id="tspan2826" 32.178 + x="162.09892" 32.179 + y="305.62619" 32.180 + style="font-family:Courier"><tspan 32.181 + style="font-weight:bold" 32.182 + id="tspan2862">4</tspan>: REV4</tspan></text> 32.183 + <text 32.184 + xml:space="preserve" 32.185 + 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" 32.186 + x="173.57143" 32.187 + y="443.79074" 32.188 + id="text2832"><tspan 32.189 + sodipodi:role="line" 32.190 + id="tspan2834" 32.191 + x="173.57143" 32.192 + y="443.79074" /></text> 32.193 + <path 32.194 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 32.195 + d="M 185.14286,478.50504 L 185.14286,454.34432" 32.196 + id="path2894" 32.197 + inkscape:connector-type="polyline" /> 32.198 + <path 32.199 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 32.200 + d="M 185.14286,431.63004 L 185.14286,407.46932" 32.201 + id="path2896" 32.202 + inkscape:connector-type="polyline" /> 32.203 + <path 32.204 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 32.205 + d="M 185.14286,384.75504 L 185.14286,360.59435" 32.206 + id="path2898" 32.207 + inkscape:connector-type="polyline" /> 32.208 + <path 32.209 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 32.210 + d="M 185.14286,337.88007 L 185.14286,313.71932" 32.211 + id="path2900" 32.212 + inkscape:connector-type="polyline" /> 32.213 + <text 32.214 + xml:space="preserve" 32.215 + 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" 32.216 + x="244.60992" 32.217 + y="305.245" 32.218 + id="text1902"><tspan 32.219 + sodipodi:role="line" 32.220 + id="tspan1904" 32.221 + x="244.60992" 32.222 + y="305.245">(newest)</tspan></text> 32.223 + <text 32.224 + xml:space="preserve" 32.225 + 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" 32.226 + x="244.60992" 32.227 + y="492.745" 32.228 + id="text1906"><tspan 32.229 + sodipodi:role="line" 32.230 + id="tspan1908" 32.231 + x="244.60992" 32.232 + y="492.745">(oldest)</tspan></text> 32.233 + <rect 32.234 + style="opacity:1;fill:#d2e1e4;fill-opacity:1;stroke:#b1cbd0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 32.235 + id="rect1907" 32.236 + width="94.285713" 32.237 + height="20.714285" 32.238 + x="309.28571" 32.239 + y="324.86218" /> 32.240 + <text 32.241 + xml:space="preserve" 32.242 + 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" 32.243 + x="333.38464" 32.244 + y="338.48334" 32.245 + id="text1909"><tspan 32.246 + sodipodi:role="line" 32.247 + id="tspan1911" 32.248 + x="333.38464" 32.249 + y="338.48334" 32.250 + style="font-family:Courier"><tspan 32.251 + style="font-weight:bold" 32.252 + id="tspan1913">4</tspan>: REV4</tspan></text> 32.253 + <path 32.254 + 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" 32.255 + d="M 332.14286,375.21932 L 335.71429,347.36218" 32.256 + id="path2802" /> 32.257 + <path 32.258 + 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" 32.259 + d="M 372.69968,375.21932 L 369.12825,347.36218" 32.260 + id="path2986" /> 32.261 + <text 32.262 + xml:space="preserve" 32.263 + 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" 32.264 + x="335.14285" 32.265 + y="387.21933" 32.266 + id="text2988"><tspan 32.267 + sodipodi:role="line" 32.268 + x="335.14285" 32.269 + y="387.21933" 32.270 + id="tspan3020" 32.271 + style="text-align:end;text-anchor:end">revision</tspan><tspan 32.272 + sodipodi:role="line" 32.273 + x="335.14285" 32.274 + y="402.21933" 32.275 + id="tspan3014" 32.276 + style="text-align:end;text-anchor:end">number</tspan></text> 32.277 + <text 32.278 + xml:space="preserve" 32.279 + 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" 32.280 + x="368.71429" 32.281 + y="387.21933" 32.282 + id="text2994"><tspan 32.283 + sodipodi:role="line" 32.284 + id="tspan2996" 32.285 + x="368.71429" 32.286 + y="387.21933">changeset</tspan><tspan 32.287 + sodipodi:role="line" 32.288 + x="368.71429" 32.289 + y="402.21933" 32.290 + id="tspan2998">identifier</tspan></text> 32.291 + </g> 32.292 +</svg>
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/en/images/tour-merge-conflict.svg Thu Mar 12 15:58:38 2009 +0800 33.3 @@ -0,0 +1,210 @@ 33.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 33.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 33.6 +<svg 33.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 33.8 + xmlns:cc="http://web.resource.org/cc/" 33.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 33.10 + xmlns:svg="http://www.w3.org/2000/svg" 33.11 + xmlns="http://www.w3.org/2000/svg" 33.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 33.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 33.14 + width="744.09448819" 33.15 + height="1052.3622047" 33.16 + id="svg2" 33.17 + sodipodi:version="0.32" 33.18 + inkscape:version="0.44.1" 33.19 + sodipodi:docname="tour-merge-conflict.svg"> 33.20 + <defs 33.21 + id="defs4"> 33.22 + <marker 33.23 + inkscape:stockid="Arrow1Mend" 33.24 + orient="auto" 33.25 + refY="0.0" 33.26 + refX="0.0" 33.27 + id="Arrow1Mend" 33.28 + style="overflow:visible;"> 33.29 + <path 33.30 + id="path3053" 33.31 + 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 " 33.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 33.33 + transform="scale(0.4) rotate(180) translate(10,0)" /> 33.34 + </marker> 33.35 + </defs> 33.36 + <sodipodi:namedview 33.37 + id="base" 33.38 + pagecolor="#ffffff" 33.39 + bordercolor="#666666" 33.40 + borderopacity="1.0" 33.41 + gridtolerance="10000" 33.42 + guidetolerance="10" 33.43 + objecttolerance="10" 33.44 + inkscape:pageopacity="0.0" 33.45 + inkscape:pageshadow="2" 33.46 + inkscape:zoom="1.4" 33.47 + inkscape:cx="164.78349" 33.48 + inkscape:cy="590.07679" 33.49 + inkscape:document-units="px" 33.50 + inkscape:current-layer="layer1" 33.51 + inkscape:window-width="906" 33.52 + inkscape:window-height="620" 33.53 + inkscape:window-x="5" 33.54 + inkscape:window-y="49" /> 33.55 + <metadata 33.56 + id="metadata7"> 33.57 + <rdf:RDF> 33.58 + <cc:Work 33.59 + rdf:about=""> 33.60 + <dc:format>image/svg+xml</dc:format> 33.61 + <dc:type 33.62 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 33.63 + </cc:Work> 33.64 + </rdf:RDF> 33.65 + </metadata> 33.66 + <g 33.67 + inkscape:label="Layer 1" 33.68 + inkscape:groupmode="layer" 33.69 + id="layer1"> 33.70 + <g 33.71 + id="g1988" 33.72 + transform="translate(84.85711,0)"> 33.73 + <g 33.74 + id="g1876"> 33.75 + <path 33.76 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.77 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 33.78 + id="path1872" 33.79 + sodipodi:nodetypes="cccccc" /> 33.80 + <path 33.81 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.82 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 33.83 + id="path1874" 33.84 + sodipodi:nodetypes="cccc" /> 33.85 + </g> 33.86 + <flowRoot 33.87 + style="font-size:8px;font-family:Times New Roman" 33.88 + id="flowRoot1898" 33.89 + xml:space="preserve"><flowRegion 33.90 + id="flowRegion1900"><rect 33.91 + style="font-size:8px;font-family:Times New Roman" 33.92 + y="464.50504" 33.93 + x="122.85714" 33.94 + height="93.571426" 33.95 + width="76.428574" 33.96 + id="rect1902" /></flowRegion><flowPara 33.97 + id="flowPara1904">Greetings!</flowPara><flowPara 33.98 + id="flowPara1906" /><flowPara 33.99 + id="flowPara1908">I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 33.100 + <g 33.101 + id="g1966" 33.102 + transform="translate(82,0.35715)"> 33.103 + <g 33.104 + transform="translate(-77.85718,-140.0714)" 33.105 + id="g1910"> 33.106 + <path 33.107 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.108 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 33.109 + id="path1912" 33.110 + sodipodi:nodetypes="cccccc" /> 33.111 + <path 33.112 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.113 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 33.114 + id="path1914" 33.115 + sodipodi:nodetypes="cccc" /> 33.116 + </g> 33.117 + <flowRoot 33.118 + transform="translate(-77.85718,-140.0714)" 33.119 + style="font-size:8px;font-family:Times New Roman" 33.120 + id="flowRoot1916" 33.121 + xml:space="preserve"><flowRegion 33.122 + id="flowRegion1918"><rect 33.123 + style="font-size:8px;font-family:Times New Roman" 33.124 + y="464.50504" 33.125 + x="122.85714" 33.126 + height="93.571426" 33.127 + width="76.428574" 33.128 + id="rect1920" /></flowRegion><flowPara 33.129 + id="flowPara1922">Greetings!</flowPara><flowPara 33.130 + id="flowPara1924" /><flowPara 33.131 + id="flowPara1926">I am <flowSpan 33.132 + style="font-style:italic;fill:red" 33.133 + id="flowSpan3094">Shehu Musa Abacha, cousin to</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 33.134 + <g 33.135 + id="g1977" 33.136 + transform="translate(81.99999,-0.35715)"> 33.137 + <g 33.138 + transform="translate(83.57141,-139.3571)" 33.139 + id="g1932"> 33.140 + <path 33.141 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.142 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 33.143 + id="path1934" 33.144 + sodipodi:nodetypes="cccccc" /> 33.145 + <path 33.146 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 33.147 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 33.148 + id="path1936" 33.149 + sodipodi:nodetypes="cccc" /> 33.150 + </g> 33.151 + <flowRoot 33.152 + transform="translate(83.57141,-139.3571)" 33.153 + style="font-size:8px;font-family:Times New Roman" 33.154 + id="flowRoot1938" 33.155 + xml:space="preserve"><flowRegion 33.156 + id="flowRegion1940"><rect 33.157 + style="font-size:8px;font-family:Times New Roman" 33.158 + y="464.50504" 33.159 + x="122.85714" 33.160 + height="93.571426" 33.161 + width="76.428574" 33.162 + id="rect1942" /></flowRegion><flowPara 33.163 + id="flowPara1944">Greetings!</flowPara><flowPara 33.164 + id="flowPara1946" /><flowPara 33.165 + id="flowPara1948">I am <flowSpan 33.166 + style="font-style:italic;fill:red" 33.167 + id="flowSpan3096">Alhaji Abba Abacha, son of</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g> 33.168 + <path 33.169 + 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" 33.170 + d="M 215.502,457.71933 L 196.35507,424.5765" 33.171 + id="path1999" 33.172 + inkscape:connector-type="polyline" 33.173 + inkscape:connection-start="#g1988" 33.174 + inkscape:connection-end="#g1966" /> 33.175 + <path 33.176 + 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" 33.177 + d="M 277.06936,457.71933 L 296.21629,424.5765" 33.178 + id="path2001" 33.179 + inkscape:connector-type="polyline" 33.180 + inkscape:connection-start="#g1988" 33.181 + inkscape:connection-end="#g1977" /> 33.182 + <text 33.183 + xml:space="preserve" 33.184 + 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" 33.185 + x="302.42859" 33.186 + y="515.08905" 33.187 + id="text1905"><tspan 33.188 + sodipodi:role="line" 33.189 + id="tspan1907" 33.190 + x="302.42859" 33.191 + y="515.08905">Base version</tspan></text> 33.192 + <text 33.193 + xml:space="preserve" 33.194 + 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" 33.195 + x="45.57143" 33.196 + y="374.1619" 33.197 + id="text1917"><tspan 33.198 + sodipodi:role="line" 33.199 + id="tspan1919" 33.200 + x="45.57143" 33.201 + y="374.1619">Our changes</tspan></text> 33.202 + <text 33.203 + xml:space="preserve" 33.204 + 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" 33.205 + x="385.71429" 33.206 + y="374.1619" 33.207 + id="text1921"><tspan 33.208 + sodipodi:role="line" 33.209 + id="tspan1923" 33.210 + x="385.71429" 33.211 + y="374.1619">Their changes</tspan></text> 33.212 + </g> 33.213 +</svg>
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/en/images/tour-merge-merge.svg Thu Mar 12 15:58:38 2009 +0800 34.3 @@ -0,0 +1,380 @@ 34.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 34.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 34.6 +<svg 34.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 34.8 + xmlns:cc="http://web.resource.org/cc/" 34.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 34.10 + xmlns:svg="http://www.w3.org/2000/svg" 34.11 + xmlns="http://www.w3.org/2000/svg" 34.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 34.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 34.14 + width="744.09448819" 34.15 + height="1052.3622047" 34.16 + id="svg2" 34.17 + sodipodi:version="0.32" 34.18 + inkscape:version="0.44.1" 34.19 + sodipodi:docname="tour-merge-merge.svg"> 34.20 + <defs 34.21 + id="defs4"> 34.22 + <marker 34.23 + inkscape:stockid="Arrow1Mstart" 34.24 + orient="auto" 34.25 + refY="0.0" 34.26 + refX="0.0" 34.27 + id="Arrow1Mstart" 34.28 + style="overflow:visible"> 34.29 + <path 34.30 + id="path2973" 34.31 + 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 " 34.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 34.33 + transform="scale(0.4) translate(10,0)" /> 34.34 + </marker> 34.35 + <marker 34.36 + inkscape:stockid="Arrow1Mend" 34.37 + orient="auto" 34.38 + refY="0.0" 34.39 + refX="0.0" 34.40 + id="Arrow1Mend" 34.41 + style="overflow:visible;"> 34.42 + <path 34.43 + id="path3066" 34.44 + 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 " 34.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 34.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 34.47 + </marker> 34.48 + </defs> 34.49 + <sodipodi:namedview 34.50 + id="base" 34.51 + pagecolor="#ffffff" 34.52 + bordercolor="#666666" 34.53 + borderopacity="1.0" 34.54 + gridtolerance="10000" 34.55 + guidetolerance="10" 34.56 + objecttolerance="10" 34.57 + inkscape:pageopacity="0.0" 34.58 + inkscape:pageshadow="2" 34.59 + inkscape:zoom="1.4" 34.60 + inkscape:cx="247.53795" 34.61 + inkscape:cy="871.05738" 34.62 + inkscape:document-units="px" 34.63 + inkscape:current-layer="layer1" 34.64 + inkscape:window-width="906" 34.65 + inkscape:window-height="620" 34.66 + inkscape:window-x="38" 34.67 + inkscape:window-y="95" /> 34.68 + <metadata 34.69 + id="metadata7"> 34.70 + <rdf:RDF> 34.71 + <cc:Work 34.72 + rdf:about=""> 34.73 + <dc:format>image/svg+xml</dc:format> 34.74 + <dc:type 34.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 34.76 + </cc:Work> 34.77 + </rdf:RDF> 34.78 + </metadata> 34.79 + <g 34.80 + inkscape:label="Layer 1" 34.81 + inkscape:groupmode="layer" 34.82 + id="layer1"> 34.83 + <rect 34.84 + 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" 34.85 + id="rect2995" 34.86 + width="94.285713" 34.87 + height="20.714285" 34.88 + x="532.85718" 34.89 + y="203.0479" /> 34.90 + <text 34.91 + xml:space="preserve" 34.92 + 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" 34.93 + x="173.57143" 34.94 + y="443.79074" 34.95 + id="text2832"><tspan 34.96 + sodipodi:role="line" 34.97 + id="tspan2834" 34.98 + x="173.57143" 34.99 + y="443.79074" /></text> 34.100 + <rect 34.101 + 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" 34.102 + id="rect2830" 34.103 + width="94.285713" 34.104 + height="20.714285" 34.105 + x="138" 34.106 + y="297.76227" /> 34.107 + <text 34.108 + xml:space="preserve" 34.109 + 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" 34.110 + x="162.09892" 34.111 + y="311.38342" 34.112 + id="text2824"><tspan 34.113 + sodipodi:role="line" 34.114 + id="tspan2826" 34.115 + x="162.09892" 34.116 + y="311.38342" 34.117 + style="font-family:Courier"><tspan 34.118 + style="font-weight:bold" 34.119 + id="tspan2862">4</tspan>: REV4</tspan></text> 34.120 + <path 34.121 + 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" 34.122 + d="M 185.14286,343.63731 L 185.14286,319.47656" 34.123 + id="path2900" 34.124 + inkscape:connector-type="polyline" /> 34.125 + <rect 34.126 + 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" 34.127 + id="rect2863" 34.128 + width="94.285713" 34.129 + height="20.714285" 34.130 + x="91.428574" 34.131 + y="250.47656" /> 34.132 + <text 34.133 + xml:space="preserve" 34.134 + 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" 34.135 + x="116.09886" 34.136 + y="264.56592" 34.137 + id="text1965" 34.138 + transform="scale(1.000002,0.999998)"><tspan 34.139 + sodipodi:role="line" 34.140 + id="tspan1967" 34.141 + x="116.09886" 34.142 + y="264.56592" 34.143 + style="font-family:Courier"><tspan 34.144 + style="font-weight:bold" 34.145 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 34.146 + <path 34.147 + 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" 34.148 + d="M 173.95727,296.76228 L 149.75702,272.19085" 34.149 + id="path1971" 34.150 + inkscape:connector-type="polyline" 34.151 + inkscape:connection-end="#rect2863" 34.152 + inkscape:connection-start="#rect2830" /> 34.153 + <rect 34.154 + 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" 34.155 + id="rect2911" 34.156 + width="94.285995" 34.157 + height="20.714283" 34.158 + x="186.71414" 34.159 + y="204.40514" /> 34.160 + <text 34.161 + xml:space="preserve" 34.162 + 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" 34.163 + x="210.81311" 34.164 + y="218.02673" 34.165 + id="text2913" 34.166 + transform="scale(1.000002,0.999998)"><tspan 34.167 + sodipodi:role="line" 34.168 + id="tspan2915" 34.169 + x="210.81311" 34.170 + y="218.02673" 34.171 + style="font-family:Courier"><tspan 34.172 + id="tspan1966" 34.173 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 34.174 + <path 34.175 + 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" 34.176 + d="M 191.06908,296.76228 L 227.93092,226.11942" 34.177 + id="path2919" 34.178 + inkscape:connector-type="polyline" 34.179 + inkscape:connection-start="#rect2830" /> 34.180 + <text 34.181 + xml:space="preserve" 34.182 + 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" 34.183 + x="295.28571" 34.184 + y="217.56711" 34.185 + id="text2871"><tspan 34.186 + sodipodi:role="line" 34.187 + id="tspan2873" 34.188 + x="295.28571" 34.189 + y="217.56711">tip (and head)</tspan></text> 34.190 + <text 34.191 + xml:space="preserve" 34.192 + 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" 34.193 + x="76" 34.194 + y="264.91769" 34.195 + id="text2875"><tspan 34.196 + sodipodi:role="line" 34.197 + id="tspan2877" 34.198 + x="76" 34.199 + y="264.91769" 34.200 + style="text-align:end;text-anchor:end">head</tspan></text> 34.201 + <rect 34.202 + 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" 34.203 + id="rect1913" 34.204 + width="94.285713" 34.205 + height="20.714285" 34.206 + x="138" 34.207 + y="156.90514" /> 34.208 + <path 34.209 + 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" 34.210 + d="M 144.22399,249.47657 L 179.49029,178.61943" 34.211 + id="path1915" 34.212 + inkscape:connector-type="polyline" 34.213 + inkscape:connection-start="#rect2863" 34.214 + inkscape:connection-end="#rect1913" /> 34.215 + <path 34.216 + 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" 34.217 + d="M 222.20966,203.40514 L 196.79033,178.61943" 34.218 + id="path1917" 34.219 + inkscape:connector-type="polyline" 34.220 + inkscape:connection-start="#rect2911" 34.221 + inkscape:connection-end="#rect1913" /> 34.222 + <text 34.223 + xml:space="preserve" 34.224 + 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" 34.225 + x="166.16823" 34.226 + y="168.52228" 34.227 + id="text2806"><tspan 34.228 + sodipodi:role="line" 34.229 + id="tspan2808" 34.230 + x="166.16823" 34.231 + y="168.52228" 34.232 + style="font-family:Courier">merge</tspan></text> 34.233 + <text 34.234 + xml:space="preserve" 34.235 + 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" 34.236 + x="246" 34.237 + y="162.63338" 34.238 + id="text2810"><tspan 34.239 + sodipodi:role="line" 34.240 + id="tspan2812" 34.241 + x="246" 34.242 + y="162.63338">working directory</tspan><tspan 34.243 + sodipodi:role="line" 34.244 + x="246" 34.245 + y="177.63338" 34.246 + id="tspan2814">during merge</tspan></text> 34.247 + <rect 34.248 + 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" 34.249 + id="rect2816" 34.250 + width="94.285713" 34.251 + height="20.714285" 34.252 + x="483.14636" 34.253 + y="297.76227" /> 34.254 + <text 34.255 + xml:space="preserve" 34.256 + 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" 34.257 + x="507.24527" 34.258 + y="311.38342" 34.259 + id="text2818"><tspan 34.260 + sodipodi:role="line" 34.261 + id="tspan2820" 34.262 + x="507.24527" 34.263 + y="311.38342" 34.264 + style="font-family:Courier"><tspan 34.265 + style="font-weight:bold" 34.266 + id="tspan2822">4</tspan>: REV4</tspan></text> 34.267 + <path 34.268 + 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" 34.269 + d="M 530.28921,343.6373 L 530.28921,319.47655" 34.270 + id="path2824" 34.271 + inkscape:connector-type="polyline" /> 34.272 + <rect 34.273 + 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" 34.274 + id="rect2826" 34.275 + width="94.285713" 34.276 + height="20.714285" 34.277 + x="436.57492" 34.278 + y="250.47656" /> 34.279 + <text 34.280 + xml:space="preserve" 34.281 + 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" 34.282 + x="461.24484" 34.283 + y="264.56613" 34.284 + id="text2828" 34.285 + transform="scale(1.000002,0.999998)"><tspan 34.286 + sodipodi:role="line" 34.287 + id="tspan2830" 34.288 + x="461.24484" 34.289 + y="264.56613" 34.290 + style="font-family:Courier"><tspan 34.291 + style="font-weight:bold" 34.292 + id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 34.293 + <path 34.294 + 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" 34.295 + d="M 519.10362,296.76227 L 494.90337,272.19084" 34.296 + id="path2834" 34.297 + inkscape:connector-type="polyline" /> 34.298 + <rect 34.299 + 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" 34.300 + id="rect2836" 34.301 + width="94.285995" 34.302 + height="20.714283" 34.303 + x="483.14001" 34.304 + y="156.548" /> 34.305 + <text 34.306 + xml:space="preserve" 34.307 + 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" 34.308 + x="555.95911" 34.309 + y="218.02698" 34.310 + id="text2838" 34.311 + transform="scale(1.000002,0.999998)"><tspan 34.312 + sodipodi:role="line" 34.313 + id="tspan2840" 34.314 + x="555.95911" 34.315 + y="218.02698" 34.316 + style="font-family:Courier"><tspan 34.317 + id="tspan2842" 34.318 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 34.319 + <path 34.320 + 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" 34.321 + d="M 536.21543,296.76227 L 574.03453,224.76218" 34.322 + id="path2844" 34.323 + inkscape:connector-type="polyline" /> 34.324 + <text 34.325 + xml:space="preserve" 34.326 + 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" 34.327 + x="594.43207" 34.328 + y="169.78796" 34.329 + id="text2846"><tspan 34.330 + sodipodi:role="line" 34.331 + id="tspan2848" 34.332 + x="594.43207" 34.333 + y="169.78796">tip</tspan></text> 34.334 + <path 34.335 + 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" 34.336 + d="M 489.37034,249.47656 L 524.65575,178.26229" 34.337 + id="path2856" 34.338 + inkscape:connector-type="polyline" 34.339 + inkscape:connection-end="#rect2836" /> 34.340 + <path 34.341 + 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" 34.342 + d="M 567.85714,202.0479 L 542.42591,178.26229" 34.343 + id="path2858" 34.344 + inkscape:connector-type="polyline" 34.345 + inkscape:connection-end="#rect2836" 34.346 + inkscape:connection-start="#rect2995" /> 34.347 + <text 34.348 + xml:space="preserve" 34.349 + 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" 34.350 + x="504.54507" 34.351 + y="170.39714" 34.352 + id="text2860"><tspan 34.353 + sodipodi:role="line" 34.354 + id="tspan2863" 34.355 + x="504.54507" 34.356 + y="170.39714" 34.357 + style="font-family:Courier"><tspan 34.358 + style="font-weight:bold" 34.359 + id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 34.360 + <text 34.361 + xml:space="preserve" 34.362 + 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" 34.363 + x="90.323105" 34.364 + y="120.21933" 34.365 + id="text2929"><tspan 34.366 + sodipodi:role="line" 34.367 + id="tspan2931" 34.368 + x="90.323105" 34.369 + y="120.21933" 34.370 + style="font-weight:bold">Working directory during merge</tspan></text> 34.371 + <text 34.372 + xml:space="preserve" 34.373 + 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" 34.374 + x="435.35226" 34.375 + y="120.21933" 34.376 + id="text2937"><tspan 34.377 + sodipodi:role="line" 34.378 + id="tspan2939" 34.379 + x="435.35226" 34.380 + y="120.21933" 34.381 + style="font-weight:bold">Repository after merge committed</tspan></text> 34.382 + </g> 34.383 +</svg>
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/en/images/tour-merge-pull.svg Thu Mar 12 15:58:38 2009 +0800 35.3 @@ -0,0 +1,288 @@ 35.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 35.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 35.6 +<svg 35.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 35.8 + xmlns:cc="http://web.resource.org/cc/" 35.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 35.10 + xmlns:svg="http://www.w3.org/2000/svg" 35.11 + xmlns="http://www.w3.org/2000/svg" 35.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 35.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 35.14 + width="744.09448819" 35.15 + height="1052.3622047" 35.16 + id="svg2" 35.17 + sodipodi:version="0.32" 35.18 + inkscape:version="0.44.1" 35.19 + sodipodi:docname="tour-merge-pull.svg" 35.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 35.21 + <defs 35.22 + id="defs4"> 35.23 + <marker 35.24 + inkscape:stockid="Arrow1Mstart" 35.25 + orient="auto" 35.26 + refY="0.0" 35.27 + refX="0.0" 35.28 + id="Arrow1Mstart" 35.29 + style="overflow:visible"> 35.30 + <path 35.31 + id="path2973" 35.32 + 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 " 35.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 35.34 + transform="scale(0.4) translate(10,0)" /> 35.35 + </marker> 35.36 + <marker 35.37 + inkscape:stockid="Arrow1Mend" 35.38 + orient="auto" 35.39 + refY="0.0" 35.40 + refX="0.0" 35.41 + id="Arrow1Mend" 35.42 + style="overflow:visible;"> 35.43 + <path 35.44 + id="path3066" 35.45 + 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 " 35.46 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 35.47 + transform="scale(0.4) rotate(180) translate(10,0)" /> 35.48 + </marker> 35.49 + </defs> 35.50 + <sodipodi:namedview 35.51 + id="base" 35.52 + pagecolor="#ffffff" 35.53 + bordercolor="#666666" 35.54 + borderopacity="1.0" 35.55 + gridtolerance="10000" 35.56 + guidetolerance="10" 35.57 + objecttolerance="10" 35.58 + inkscape:pageopacity="0.0" 35.59 + inkscape:pageshadow="2" 35.60 + inkscape:zoom="1.4" 35.61 + inkscape:cx="233.63208" 35.62 + inkscape:cy="832.54381" 35.63 + inkscape:document-units="px" 35.64 + inkscape:current-layer="layer1" 35.65 + inkscape:window-width="906" 35.66 + inkscape:window-height="620" 35.67 + inkscape:window-x="237" 35.68 + inkscape:window-y="103" /> 35.69 + <metadata 35.70 + id="metadata7"> 35.71 + <rdf:RDF> 35.72 + <cc:Work 35.73 + rdf:about=""> 35.74 + <dc:format>image/svg+xml</dc:format> 35.75 + <dc:type 35.76 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 35.77 + </cc:Work> 35.78 + </rdf:RDF> 35.79 + </metadata> 35.80 + <g 35.81 + inkscape:label="Layer 1" 35.82 + inkscape:groupmode="layer" 35.83 + id="layer1"> 35.84 + <text 35.85 + xml:space="preserve" 35.86 + 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" 35.87 + x="173.57143" 35.88 + y="443.79074" 35.89 + id="text2832"><tspan 35.90 + sodipodi:role="line" 35.91 + id="tspan2834" 35.92 + x="173.57143" 35.93 + y="443.79074" /></text> 35.94 + <rect 35.95 + 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" 35.96 + id="rect1878" 35.97 + width="94.285713" 35.98 + height="20.714285" 35.99 + x="138" 35.100 + y="479.50504" /> 35.101 + <text 35.102 + xml:space="preserve" 35.103 + 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" 35.104 + x="162.09892" 35.105 + y="493.12619" 35.106 + id="text1872"><tspan 35.107 + sodipodi:role="line" 35.108 + id="tspan1874" 35.109 + x="162.09892" 35.110 + y="493.12619" 35.111 + style="font-family:Courier"><tspan 35.112 + style="font-weight:bold" 35.113 + id="tspan1876">0</tspan>: REV0</tspan></text> 35.114 + <rect 35.115 + 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" 35.116 + id="rect2800" 35.117 + width="94.285713" 35.118 + height="20.714285" 35.119 + x="138" 35.120 + y="432.63004" /> 35.121 + <text 35.122 + xml:space="preserve" 35.123 + 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" 35.124 + x="162.09892" 35.125 + y="446.25119" 35.126 + id="text2794"><tspan 35.127 + sodipodi:role="line" 35.128 + id="tspan2796" 35.129 + x="162.09892" 35.130 + y="446.25119" 35.131 + style="font-family:Courier"><tspan 35.132 + id="tspan2868" 35.133 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 35.134 + <rect 35.135 + 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" 35.136 + id="rect2810" 35.137 + width="94.285713" 35.138 + height="20.714285" 35.139 + x="138" 35.140 + y="385.75504" /> 35.141 + <text 35.142 + xml:space="preserve" 35.143 + 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" 35.144 + x="162.09892" 35.145 + y="399.37619" 35.146 + id="text2804"><tspan 35.147 + sodipodi:role="line" 35.148 + id="tspan2806" 35.149 + x="162.09892" 35.150 + y="399.37619" 35.151 + style="font-family:Courier"><tspan 35.152 + style="font-weight:bold" 35.153 + id="tspan2866">2</tspan>: REV2</tspan></text> 35.154 + <rect 35.155 + 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" 35.156 + id="rect2820" 35.157 + width="94.285713" 35.158 + height="20.714285" 35.159 + x="138" 35.160 + y="338.88007" /> 35.161 + <text 35.162 + xml:space="preserve" 35.163 + 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" 35.164 + x="162.09892" 35.165 + y="352.50122" 35.166 + id="text2814"><tspan 35.167 + sodipodi:role="line" 35.168 + id="tspan2816" 35.169 + x="162.09892" 35.170 + y="352.50122" 35.171 + style="font-family:Courier"><tspan 35.172 + style="font-weight:bold" 35.173 + id="tspan2864">3</tspan>: REV3</tspan></text> 35.174 + <rect 35.175 + 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" 35.176 + id="rect2830" 35.177 + width="94.285713" 35.178 + height="20.714285" 35.179 + x="138" 35.180 + y="292.00504" /> 35.181 + <text 35.182 + xml:space="preserve" 35.183 + 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" 35.184 + x="162.09892" 35.185 + y="305.62619" 35.186 + id="text2824"><tspan 35.187 + sodipodi:role="line" 35.188 + id="tspan2826" 35.189 + x="162.09892" 35.190 + y="305.62619" 35.191 + style="font-family:Courier"><tspan 35.192 + style="font-weight:bold" 35.193 + id="tspan2862">4</tspan>: REV4</tspan></text> 35.194 + <path 35.195 + 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" 35.196 + d="M 185.14286,478.50504 L 185.14286,454.34432" 35.197 + id="path2894" 35.198 + inkscape:connector-type="polyline" /> 35.199 + <path 35.200 + 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" 35.201 + d="M 185.14286,431.63004 L 185.14286,407.46932" 35.202 + id="path2896" 35.203 + inkscape:connector-type="polyline" /> 35.204 + <path 35.205 + 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" 35.206 + d="M 185.14286,384.75504 L 185.14286,360.59435" 35.207 + id="path2898" 35.208 + inkscape:connector-type="polyline" /> 35.209 + <path 35.210 + 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" 35.211 + d="M 185.14286,337.88007 L 185.14286,313.71932" 35.212 + id="path2900" 35.213 + inkscape:connector-type="polyline" /> 35.214 + <rect 35.215 + 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" 35.216 + id="rect2863" 35.217 + width="94.285713" 35.218 + height="20.714285" 35.219 + x="91.428574" 35.220 + y="244.71933" /> 35.221 + <text 35.222 + xml:space="preserve" 35.223 + 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" 35.224 + x="116.09886" 35.225 + y="258.80865" 35.226 + id="text1965" 35.227 + transform="scale(1.000002,0.999998)"><tspan 35.228 + sodipodi:role="line" 35.229 + id="tspan1967" 35.230 + x="116.09886" 35.231 + y="258.80865" 35.232 + style="font-family:Courier"><tspan 35.233 + style="font-weight:bold" 35.234 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 35.235 + <path 35.236 + 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" 35.237 + d="M 173.95727,291.00504 L 149.75702,266.43361" 35.238 + id="path1971" 35.239 + inkscape:connector-type="polyline" 35.240 + inkscape:connection-end="#rect2863" 35.241 + inkscape:connection-start="#rect2830" /> 35.242 + <rect 35.243 + 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" 35.244 + id="rect2911" 35.245 + width="94.285995" 35.246 + height="20.714283" 35.247 + x="186.71414" 35.248 + y="198.6479" /> 35.249 + <text 35.250 + xml:space="preserve" 35.251 + 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" 35.252 + x="210.81311" 35.253 + y="212.26949" 35.254 + id="text2913" 35.255 + transform="scale(1.000002,0.999998)"><tspan 35.256 + sodipodi:role="line" 35.257 + id="tspan2915" 35.258 + x="210.81311" 35.259 + y="212.26949" 35.260 + style="font-family:Courier"><tspan 35.261 + id="tspan1966" 35.262 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 35.263 + <path 35.264 + 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" 35.265 + d="M 191.06908,291.00504 L 227.93092,220.36218" 35.266 + id="path2919" 35.267 + inkscape:connector-type="polyline" 35.268 + inkscape:connection-start="#rect2830" /> 35.269 + <text 35.270 + xml:space="preserve" 35.271 + 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" 35.272 + x="295.28571" 35.273 + y="211.80988" 35.274 + id="text2871"><tspan 35.275 + sodipodi:role="line" 35.276 + id="tspan2873" 35.277 + x="295.28571" 35.278 + y="211.80988">tip (and head)</tspan></text> 35.279 + <text 35.280 + xml:space="preserve" 35.281 + 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" 35.282 + x="76" 35.283 + y="259.16046" 35.284 + id="text2875"><tspan 35.285 + sodipodi:role="line" 35.286 + id="tspan2877" 35.287 + x="76" 35.288 + y="259.16046" 35.289 + style="text-align:end;text-anchor:end">head</tspan></text> 35.290 + </g> 35.291 +</svg>
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/en/images/tour-merge-sep-repos.svg Thu Mar 12 15:58:38 2009 +0800 36.3 @@ -0,0 +1,466 @@ 36.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 36.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 36.6 +<svg 36.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 36.8 + xmlns:cc="http://web.resource.org/cc/" 36.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 36.10 + xmlns:svg="http://www.w3.org/2000/svg" 36.11 + xmlns="http://www.w3.org/2000/svg" 36.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 36.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 36.14 + width="744.09448819" 36.15 + height="1052.3622047" 36.16 + id="svg2" 36.17 + sodipodi:version="0.32" 36.18 + inkscape:version="0.44.1" 36.19 + sodipodi:docname="tour-merge-sep-repos.svg"> 36.20 + <defs 36.21 + id="defs4"> 36.22 + <marker 36.23 + inkscape:stockid="Arrow1Mstart" 36.24 + orient="auto" 36.25 + refY="0.0" 36.26 + refX="0.0" 36.27 + id="Arrow1Mstart" 36.28 + style="overflow:visible"> 36.29 + <path 36.30 + id="path2973" 36.31 + 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 " 36.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 36.33 + transform="scale(0.4) translate(10,0)" /> 36.34 + </marker> 36.35 + <marker 36.36 + inkscape:stockid="Arrow1Mend" 36.37 + orient="auto" 36.38 + refY="0.0" 36.39 + refX="0.0" 36.40 + id="Arrow1Mend" 36.41 + style="overflow:visible;"> 36.42 + <path 36.43 + id="path3066" 36.44 + 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 " 36.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 36.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 36.47 + </marker> 36.48 + </defs> 36.49 + <sodipodi:namedview 36.50 + id="base" 36.51 + pagecolor="#ffffff" 36.52 + bordercolor="#666666" 36.53 + borderopacity="1.0" 36.54 + gridtolerance="10000" 36.55 + guidetolerance="10" 36.56 + objecttolerance="10" 36.57 + inkscape:pageopacity="0.0" 36.58 + inkscape:pageshadow="2" 36.59 + inkscape:zoom="1.4" 36.60 + inkscape:cx="307.20351" 36.61 + inkscape:cy="716.87911" 36.62 + inkscape:document-units="px" 36.63 + inkscape:current-layer="layer1" 36.64 + inkscape:window-width="906" 36.65 + inkscape:window-height="620" 36.66 + inkscape:window-x="5" 36.67 + inkscape:window-y="49" /> 36.68 + <metadata 36.69 + id="metadata7"> 36.70 + <rdf:RDF> 36.71 + <cc:Work 36.72 + rdf:about=""> 36.73 + <dc:format>image/svg+xml</dc:format> 36.74 + <dc:type 36.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 36.76 + </cc:Work> 36.77 + </rdf:RDF> 36.78 + </metadata> 36.79 + <g 36.80 + inkscape:label="Layer 1" 36.81 + inkscape:groupmode="layer" 36.82 + id="layer1"> 36.83 + <text 36.84 + xml:space="preserve" 36.85 + 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" 36.86 + x="173.57143" 36.87 + y="443.79074" 36.88 + id="text2832"><tspan 36.89 + sodipodi:role="line" 36.90 + id="tspan2834" 36.91 + x="173.57143" 36.92 + y="443.79074" /></text> 36.93 + <rect 36.94 + 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" 36.95 + id="rect1878" 36.96 + width="94.285713" 36.97 + height="20.714285" 36.98 + x="138" 36.99 + y="479.50504" /> 36.100 + <text 36.101 + xml:space="preserve" 36.102 + 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" 36.103 + x="162.09892" 36.104 + y="493.12619" 36.105 + id="text1872"><tspan 36.106 + sodipodi:role="line" 36.107 + id="tspan1874" 36.108 + x="162.09892" 36.109 + y="493.12619" 36.110 + style="font-family:Courier"><tspan 36.111 + style="font-weight:bold" 36.112 + id="tspan1876">0</tspan>: REV0</tspan></text> 36.113 + <rect 36.114 + 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" 36.115 + id="rect2800" 36.116 + width="94.285713" 36.117 + height="20.714285" 36.118 + x="138" 36.119 + y="432.63004" /> 36.120 + <text 36.121 + xml:space="preserve" 36.122 + 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" 36.123 + x="162.09892" 36.124 + y="446.25119" 36.125 + id="text2794"><tspan 36.126 + sodipodi:role="line" 36.127 + id="tspan2796" 36.128 + x="162.09892" 36.129 + y="446.25119" 36.130 + style="font-family:Courier"><tspan 36.131 + id="tspan2868" 36.132 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 36.133 + <rect 36.134 + 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" 36.135 + id="rect2810" 36.136 + width="94.285713" 36.137 + height="20.714285" 36.138 + x="138" 36.139 + y="385.75504" /> 36.140 + <text 36.141 + xml:space="preserve" 36.142 + 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" 36.143 + x="162.09892" 36.144 + y="399.37619" 36.145 + id="text2804"><tspan 36.146 + sodipodi:role="line" 36.147 + id="tspan2806" 36.148 + x="162.09892" 36.149 + y="399.37619" 36.150 + style="font-family:Courier"><tspan 36.151 + style="font-weight:bold" 36.152 + id="tspan2866">2</tspan>: REV2</tspan></text> 36.153 + <rect 36.154 + 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" 36.155 + id="rect2820" 36.156 + width="94.285713" 36.157 + height="20.714285" 36.158 + x="138" 36.159 + y="338.88007" /> 36.160 + <text 36.161 + xml:space="preserve" 36.162 + 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" 36.163 + x="162.09892" 36.164 + y="352.50122" 36.165 + id="text2814"><tspan 36.166 + sodipodi:role="line" 36.167 + id="tspan2816" 36.168 + x="162.09892" 36.169 + y="352.50122" 36.170 + style="font-family:Courier"><tspan 36.171 + style="font-weight:bold" 36.172 + id="tspan2864">3</tspan>: REV3</tspan></text> 36.173 + <rect 36.174 + 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" 36.175 + id="rect2830" 36.176 + width="94.285713" 36.177 + height="20.714285" 36.178 + x="138" 36.179 + y="292.00504" /> 36.180 + <text 36.181 + xml:space="preserve" 36.182 + 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" 36.183 + x="162.09892" 36.184 + y="305.62619" 36.185 + id="text2824"><tspan 36.186 + sodipodi:role="line" 36.187 + id="tspan2826" 36.188 + x="162.09892" 36.189 + y="305.62619" 36.190 + style="font-family:Courier"><tspan 36.191 + style="font-weight:bold" 36.192 + id="tspan2862">4</tspan>: REV4</tspan></text> 36.193 + <path 36.194 + 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" 36.195 + d="M 185.14286,478.50504 L 185.14286,454.34432" 36.196 + id="path2894" 36.197 + inkscape:connector-type="polyline" /> 36.198 + <path 36.199 + 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" 36.200 + d="M 185.14286,431.63004 L 185.14286,407.46932" 36.201 + id="path2896" 36.202 + inkscape:connector-type="polyline" /> 36.203 + <path 36.204 + 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" 36.205 + d="M 185.14286,384.75504 L 185.14286,360.59435" 36.206 + id="path2898" 36.207 + inkscape:connector-type="polyline" /> 36.208 + <path 36.209 + 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" 36.210 + d="M 185.14286,337.88007 L 185.14286,313.71932" 36.211 + id="path2900" 36.212 + inkscape:connector-type="polyline" /> 36.213 + <rect 36.214 + 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" 36.215 + id="rect1963" 36.216 + width="94.285995" 36.217 + height="20.714283" 36.218 + x="138" 36.219 + y="245.18723" /> 36.220 + <text 36.221 + xml:space="preserve" 36.222 + 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" 36.223 + x="162.09877" 36.224 + y="258.80865" 36.225 + id="text1965" 36.226 + transform="scale(1.000002,0.999998)"><tspan 36.227 + sodipodi:role="line" 36.228 + id="tspan1967" 36.229 + x="162.09877" 36.230 + y="258.80865" 36.231 + style="font-family:Courier"><tspan 36.232 + style="font-weight:bold" 36.233 + id="tspan1973">5</tspan>: REV_my_hello</tspan></text> 36.234 + <path 36.235 + 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" 36.236 + d="M 185.143,291.06218 L 185.143,266.90143" 36.237 + id="path1971" 36.238 + inkscape:connector-type="polyline" /> 36.239 + <text 36.240 + xml:space="preserve" 36.241 + 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" 36.242 + x="136.90039" 36.243 + y="232.25546" 36.244 + id="text2921"><tspan 36.245 + sodipodi:role="line" 36.246 + id="tspan2923" 36.247 + x="136.90039" 36.248 + y="232.25546">my-hello</tspan></text> 36.249 + <rect 36.250 + 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" 36.251 + id="rect2863" 36.252 + width="94.285713" 36.253 + height="20.714285" 36.254 + x="370.71414" 36.255 + y="479.49289" /> 36.256 + <text 36.257 + xml:space="preserve" 36.258 + 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" 36.259 + x="394.81305" 36.260 + y="493.11404" 36.261 + id="text2865"><tspan 36.262 + sodipodi:role="line" 36.263 + id="tspan2867" 36.264 + x="394.81305" 36.265 + y="493.11404" 36.266 + style="font-family:Courier"><tspan 36.267 + style="font-weight:bold" 36.268 + id="tspan2869">0</tspan>: REV0</tspan></text> 36.269 + <rect 36.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" 36.271 + id="rect2871" 36.272 + width="94.285713" 36.273 + height="20.714285" 36.274 + x="370.71414" 36.275 + y="432.61789" /> 36.276 + <text 36.277 + xml:space="preserve" 36.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:Courier" 36.279 + x="394.81305" 36.280 + y="446.23904" 36.281 + id="text2873"><tspan 36.282 + sodipodi:role="line" 36.283 + id="tspan2875" 36.284 + x="394.81305" 36.285 + y="446.23904" 36.286 + style="font-family:Courier"><tspan 36.287 + id="tspan2877" 36.288 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 36.289 + <rect 36.290 + 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" 36.291 + id="rect2879" 36.292 + width="94.285713" 36.293 + height="20.714285" 36.294 + x="370.71414" 36.295 + y="385.74289" /> 36.296 + <text 36.297 + xml:space="preserve" 36.298 + 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" 36.299 + x="394.81305" 36.300 + y="399.36404" 36.301 + id="text2881"><tspan 36.302 + sodipodi:role="line" 36.303 + id="tspan2883" 36.304 + x="394.81305" 36.305 + y="399.36404" 36.306 + style="font-family:Courier"><tspan 36.307 + style="font-weight:bold" 36.308 + id="tspan2885">2</tspan>: REV2</tspan></text> 36.309 + <rect 36.310 + 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" 36.311 + id="rect2887" 36.312 + width="94.285713" 36.313 + height="20.714285" 36.314 + x="370.71414" 36.315 + y="338.86792" /> 36.316 + <text 36.317 + xml:space="preserve" 36.318 + 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" 36.319 + x="394.81305" 36.320 + y="352.48907" 36.321 + id="text2889"><tspan 36.322 + sodipodi:role="line" 36.323 + id="tspan2891" 36.324 + x="394.81305" 36.325 + y="352.48907" 36.326 + style="font-family:Courier"><tspan 36.327 + style="font-weight:bold" 36.328 + id="tspan2893">3</tspan>: REV3</tspan></text> 36.329 + <rect 36.330 + 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" 36.331 + id="rect2895" 36.332 + width="94.285713" 36.333 + height="20.714285" 36.334 + x="370.71414" 36.335 + y="291.99289" /> 36.336 + <text 36.337 + xml:space="preserve" 36.338 + 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" 36.339 + x="394.81305" 36.340 + y="305.61404" 36.341 + id="text2897"><tspan 36.342 + sodipodi:role="line" 36.343 + id="tspan2899" 36.344 + x="394.81305" 36.345 + y="305.61404" 36.346 + style="font-family:Courier"><tspan 36.347 + style="font-weight:bold" 36.348 + id="tspan2901">4</tspan>: REV4</tspan></text> 36.349 + <path 36.350 + 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" 36.351 + d="M 417.85701,478.4929 L 417.85701,454.33218" 36.352 + id="path2903" 36.353 + inkscape:connector-type="polyline" /> 36.354 + <path 36.355 + 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" 36.356 + d="M 417.85701,431.6179 L 417.85701,407.45718" 36.357 + id="path2905" 36.358 + inkscape:connector-type="polyline" /> 36.359 + <path 36.360 + 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" 36.361 + d="M 417.85701,384.7429 L 417.85701,360.58221" 36.362 + id="path2907" 36.363 + inkscape:connector-type="polyline" /> 36.364 + <path 36.365 + 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" 36.366 + d="M 417.85701,337.86793 L 417.85701,313.70718" 36.367 + id="path2909" 36.368 + inkscape:connector-type="polyline" /> 36.369 + <rect 36.370 + 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" 36.371 + id="rect2911" 36.372 + width="94.285995" 36.373 + height="20.714283" 36.374 + x="370.71414" 36.375 + y="245.17511" /> 36.376 + <text 36.377 + xml:space="preserve" 36.378 + 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" 36.379 + x="394.81274" 36.380 + y="258.79678" 36.381 + id="text2913" 36.382 + transform="scale(1.000002,0.999998)"><tspan 36.383 + sodipodi:role="line" 36.384 + id="tspan2915" 36.385 + x="394.81274" 36.386 + y="258.79678" 36.387 + style="font-family:Courier"><tspan 36.388 + style="font-weight:bold" 36.389 + id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text> 36.390 + <path 36.391 + 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" 36.392 + d="M 417.85715,291.05004 L 417.85715,266.88929" 36.393 + id="path2919" 36.394 + inkscape:connector-type="polyline" /> 36.395 + <text 36.396 + xml:space="preserve" 36.397 + 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" 36.398 + x="369.61453" 36.399 + y="232.25546" 36.400 + id="text2925"><tspan 36.401 + sodipodi:role="line" 36.402 + id="tspan2927" 36.403 + x="369.61453" 36.404 + y="232.25546">my-new-hello</tspan></text> 36.405 + <text 36.406 + xml:space="preserve" 36.407 + 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" 36.408 + x="300.54352" 36.409 + y="252.12723" 36.410 + id="text2933"><tspan 36.411 + sodipodi:role="line" 36.412 + id="tspan2935" 36.413 + x="300.54352" 36.414 + y="252.12723" 36.415 + style="text-align:center;text-anchor:middle">newest changes</tspan><tspan 36.416 + sodipodi:role="line" 36.417 + x="300.54352" 36.418 + y="267.12723" 36.419 + style="text-align:center;text-anchor:middle" 36.420 + id="tspan3132">differ</tspan></text> 36.421 + <text 36.422 + xml:space="preserve" 36.423 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 36.424 + x="262.15436" 36.425 + y="398.37112" 36.426 + id="text2929"><tspan 36.427 + sodipodi:role="line" 36.428 + x="262.15436" 36.429 + y="398.37112" 36.430 + id="tspan3013" 36.431 + style="text-align:start;text-anchor:start">common history</tspan></text> 36.432 + <g 36.433 + id="g3107" 36.434 + transform="translate(0,0.855744)"> 36.435 + <path 36.436 + id="path3101" 36.437 + d="M 300.35713,381.29075 L 300.35713,304.50504" 36.438 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" /> 36.439 + <path 36.440 + id="path3105" 36.441 + d="M 291.07142,301.64789 L 309.28571,301.64789" 36.442 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 36.443 + </g> 36.444 + <path 36.445 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 36.446 + d="M 300.53571,486.38926 L 300.53571,409.60355" 36.447 + id="path3113" /> 36.448 + <path 36.449 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 36.450 + d="M 291.25,488.49641 L 309.46429,488.49641" 36.451 + id="path3115" /> 36.452 + <text 36.453 + xml:space="preserve" 36.454 + 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" 36.455 + x="480.71429" 36.456 + y="250.91507" 36.457 + id="text1949"><tspan 36.458 + sodipodi:role="line" 36.459 + id="tspan1951" 36.460 + x="480.71429" 36.461 + y="250.91507" 36.462 + style="text-align:start;text-anchor:start">head revision</tspan><tspan 36.463 + sodipodi:role="line" 36.464 + x="480.71429" 36.465 + y="265.91507" 36.466 + id="tspan1953" 36.467 + style="text-align:start;text-anchor:start">(has no children)</tspan></text> 36.468 + </g> 36.469 +</svg>
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 37.2 +++ b/en/images/undo-manual-merge.dot Thu Mar 12 15:58:38 2009 +0800 37.3 @@ -0,0 +1,8 @@ 37.4 +digraph undo_manual { 37.5 + "first change" -> "second change"; 37.6 + "second change" -> "third change"; 37.7 + backout [label="back out\nsecond change", shape=box]; 37.8 + "second change" -> backout; 37.9 + "third change" -> "manual\nmerge"; 37.10 + backout -> "manual\nmerge"; 37.11 +}
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 38.2 +++ b/en/images/undo-manual.dot Thu Mar 12 15:58:38 2009 +0800 38.3 @@ -0,0 +1,6 @@ 38.4 +digraph undo_manual { 38.5 + "first change" -> "second change"; 38.6 + "second change" -> "third change"; 38.7 + backout [label="back out\nsecond change", shape=box]; 38.8 + "second change" -> backout; 38.9 +}
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 39.2 +++ b/en/images/undo-non-tip.dot Thu Mar 12 15:58:38 2009 +0800 39.3 @@ -0,0 +1,9 @@ 39.4 +digraph undo_non_tip { 39.5 + "first change" -> "second change"; 39.6 + "second change" -> "third change"; 39.7 + backout [label="back out\nsecond change", shape=box]; 39.8 + "second change" -> backout; 39.9 + merge [label="automated\nmerge", shape=box]; 39.10 + "third change" -> merge; 39.11 + backout -> merge; 39.12 +}
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 40.2 +++ b/en/images/undo-simple.dot Thu Mar 12 15:58:38 2009 +0800 40.3 @@ -0,0 +1,4 @@ 40.4 +digraph undo_simple { 40.5 + "first change" -> "second change"; 40.6 + "second change" -> "back out\nsecond change"; 40.7 +}
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/en/images/wdir-after-commit.svg Thu Mar 12 15:58:38 2009 +0800 41.3 @@ -0,0 +1,394 @@ 41.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 41.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 41.6 +<svg 41.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 41.8 + xmlns:cc="http://web.resource.org/cc/" 41.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 41.10 + xmlns:svg="http://www.w3.org/2000/svg" 41.11 + xmlns="http://www.w3.org/2000/svg" 41.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 41.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 41.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 41.15 + width="744.09448819" 41.16 + height="1052.3622047" 41.17 + id="svg5971" 41.18 + sodipodi:version="0.32" 41.19 + inkscape:version="0.44.1" 41.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 41.21 + sodipodi:docname="wdir-after-commit.svg"> 41.22 + <defs 41.23 + id="defs5973"> 41.24 + <linearGradient 41.25 + inkscape:collect="always" 41.26 + xlink:href="#linearGradient6049" 41.27 + id="linearGradient6445" 41.28 + gradientUnits="userSpaceOnUse" 41.29 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 41.30 + x1="333.91171" 41.31 + y1="488.79077" 41.32 + x2="508.94543" 41.33 + y2="263.79077" /> 41.34 + <marker 41.35 + inkscape:stockid="Arrow1Mstart" 41.36 + orient="auto" 41.37 + refY="0.0" 41.38 + refX="0.0" 41.39 + id="Arrow1Mstart" 41.40 + style="overflow:visible"> 41.41 + <path 41.42 + id="path4855" 41.43 + 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 " 41.44 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 41.45 + transform="scale(0.4) translate(10,0)" /> 41.46 + </marker> 41.47 + <linearGradient 41.48 + id="linearGradient6049"> 41.49 + <stop 41.50 + style="stop-color:#686868;stop-opacity:1;" 41.51 + offset="0" 41.52 + id="stop6051" /> 41.53 + <stop 41.54 + style="stop-color:#f0f0f0;stop-opacity:1;" 41.55 + offset="1" 41.56 + id="stop6053" /> 41.57 + </linearGradient> 41.58 + <marker 41.59 + inkscape:stockid="Arrow1Mend" 41.60 + orient="auto" 41.61 + refY="0.0" 41.62 + refX="0.0" 41.63 + id="Arrow1Mend" 41.64 + style="overflow:visible;"> 41.65 + <path 41.66 + id="path4852" 41.67 + 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 " 41.68 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 41.69 + transform="scale(0.4) rotate(180) translate(10,0)" /> 41.70 + </marker> 41.71 + <linearGradient 41.72 + inkscape:collect="always" 41.73 + xlink:href="#linearGradient6049" 41.74 + id="linearGradient6083" 41.75 + gradientUnits="userSpaceOnUse" 41.76 + gradientTransform="translate(-240.0462,-8.633237e-6)" 41.77 + x1="333.91171" 41.78 + y1="488.79077" 41.79 + x2="508.94543" 41.80 + y2="263.79077" /> 41.81 + <linearGradient 41.82 + inkscape:collect="always" 41.83 + xlink:href="#linearGradient6049" 41.84 + id="linearGradient6142" 41.85 + gradientUnits="userSpaceOnUse" 41.86 + gradientTransform="translate(-42.00893,-30.49544)" 41.87 + x1="333.91171" 41.88 + y1="488.79077" 41.89 + x2="508.94543" 41.90 + y2="263.79077" /> 41.91 + <linearGradient 41.92 + inkscape:collect="always" 41.93 + xlink:href="#linearGradient6049" 41.94 + id="linearGradient6193" 41.95 + gradientUnits="userSpaceOnUse" 41.96 + gradientTransform="translate(-240.0462,-8.633237e-6)" 41.97 + x1="333.91171" 41.98 + y1="488.79077" 41.99 + x2="508.94543" 41.100 + y2="263.79077" /> 41.101 + <linearGradient 41.102 + inkscape:collect="always" 41.103 + xlink:href="#linearGradient6049" 41.104 + id="linearGradient6216" 41.105 + gradientUnits="userSpaceOnUse" 41.106 + gradientTransform="translate(-6.0462,-0.664361)" 41.107 + x1="333.91171" 41.108 + y1="488.79077" 41.109 + x2="508.94543" 41.110 + y2="263.79077" /> 41.111 + <linearGradient 41.112 + inkscape:collect="always" 41.113 + xlink:href="#linearGradient6049" 41.114 + id="linearGradient6232" 41.115 + gradientUnits="userSpaceOnUse" 41.116 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 41.117 + x1="333.91171" 41.118 + y1="488.79077" 41.119 + x2="508.94543" 41.120 + y2="263.79077" /> 41.121 + <linearGradient 41.122 + inkscape:collect="always" 41.123 + xlink:href="#linearGradient6049" 41.124 + id="linearGradient6772" 41.125 + gradientUnits="userSpaceOnUse" 41.126 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 41.127 + x1="333.91171" 41.128 + y1="488.79077" 41.129 + x2="508.94543" 41.130 + y2="263.79077" /> 41.131 + </defs> 41.132 + <sodipodi:namedview 41.133 + id="base" 41.134 + pagecolor="#ffffff" 41.135 + bordercolor="#666666" 41.136 + borderopacity="1.0" 41.137 + gridtolerance="10000" 41.138 + guidetolerance="10" 41.139 + objecttolerance="10" 41.140 + inkscape:pageopacity="0.0" 41.141 + inkscape:pageshadow="2" 41.142 + inkscape:zoom="0.90509668" 41.143 + inkscape:cx="390.0539" 41.144 + inkscape:cy="690.49342" 41.145 + inkscape:document-units="px" 41.146 + inkscape:current-layer="layer1" 41.147 + showguides="true" 41.148 + inkscape:guide-bbox="true" 41.149 + inkscape:window-width="906" 41.150 + inkscape:window-height="620" 41.151 + inkscape:window-x="0" 41.152 + inkscape:window-y="25"> 41.153 + <sodipodi:guide 41.154 + orientation="vertical" 41.155 + position="-1.4285714" 41.156 + id="guide6022" /> 41.157 + </sodipodi:namedview> 41.158 + <metadata 41.159 + id="metadata5976"> 41.160 + <rdf:RDF> 41.161 + <cc:Work 41.162 + rdf:about=""> 41.163 + <dc:format>image/svg+xml</dc:format> 41.164 + <dc:type 41.165 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 41.166 + </cc:Work> 41.167 + </rdf:RDF> 41.168 + </metadata> 41.169 + <g 41.170 + inkscape:label="Layer 1" 41.171 + inkscape:groupmode="layer" 41.172 + id="layer1"> 41.173 + <rect 41.174 + y="245.98355" 41.175 + x="328.23956" 41.176 + height="258.57144" 41.177 + width="174.28572" 41.178 + id="rect6047" 41.179 + 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" /> 41.180 + <g 41.181 + id="g6261" 41.182 + transform="translate(234,0)"> 41.183 + <rect 41.184 + y="258.7149" 41.185 + x="114.11369" 41.186 + height="44.537449" 41.187 + width="134.53746" 41.188 + id="rect5983" 41.189 + 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" /> 41.190 + <text 41.191 + id="text5985" 41.192 + y="284.47562" 41.193 + x="138.7962" 41.194 + 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" 41.195 + xml:space="preserve"><tspan 41.196 + style="font-family:Courier" 41.197 + y="284.47562" 41.198 + x="138.7962" 41.199 + id="tspan5987" 41.200 + sodipodi:role="line">dfbbb33f3fa3</tspan></text> 41.201 + </g> 41.202 + <rect 41.203 + 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" 41.204 + id="rect5996" 41.205 + width="134.53746" 41.206 + height="44.537449" 41.207 + x="348.11371" 41.208 + y="320.38159" /> 41.209 + <text 41.210 + xml:space="preserve" 41.211 + 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" 41.212 + x="372.7962" 41.213 + y="346.1423" 41.214 + id="text5998"><tspan 41.215 + sodipodi:role="line" 41.216 + id="tspan6000" 41.217 + x="372.7962" 41.218 + y="346.1423" 41.219 + style="font-family:Courier">e7639888bb2f</tspan></text> 41.220 + <rect 41.221 + 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" 41.222 + id="rect6004" 41.223 + width="134.53746" 41.224 + height="44.537449" 41.225 + x="348.11371" 41.226 + y="382.04825" /> 41.227 + <text 41.228 + xml:space="preserve" 41.229 + 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" 41.230 + x="370.65421" 41.231 + y="407.80896" 41.232 + id="text6006"><tspan 41.233 + sodipodi:role="line" 41.234 + id="tspan6008" 41.235 + x="370.65421" 41.236 + y="407.80896" 41.237 + style="font-family:Courier">7b064d8bac5e</tspan></text> 41.238 + <path 41.239 + inkscape:connector-type="polyline" 41.240 + id="path6018" 41.241 + d="M 415.38242,303.62646 L 415.38242,320.00744" 41.242 + 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" /> 41.243 + <path 41.244 + inkscape:connection-end="#rect6004" 41.245 + inkscape:connector-type="polyline" 41.246 + id="path6020" 41.247 + d="M 415.38242,365.29315 L 415.38243,381.67412" 41.248 + 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" /> 41.249 + <rect 41.250 + 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" 41.251 + id="rect6039" 41.252 + width="134.53746" 41.253 + height="44.537449" 41.254 + x="348.11359" 41.255 + y="443.71487" /> 41.256 + <text 41.257 + xml:space="preserve" 41.258 + 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" 41.259 + x="372.79706" 41.260 + y="469.47556" 41.261 + id="text6041"><tspan 41.262 + sodipodi:role="line" 41.263 + id="tspan6043" 41.264 + x="372.79706" 41.265 + y="469.47556" 41.266 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 41.267 + <path 41.268 + inkscape:connection-end="#rect6039" 41.269 + inkscape:connector-type="polyline" 41.270 + id="path6045" 41.271 + d="M 415.38238,426.95981 L 415.38235,443.34087" 41.272 + 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" /> 41.273 + <text 41.274 + xml:space="preserve" 41.275 + 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" 41.276 + x="327.66046" 41.277 + y="231.36218" 41.278 + id="text6102"><tspan 41.279 + sodipodi:role="line" 41.280 + id="tspan6104" 41.281 + x="327.66046" 41.282 + y="231.36218">History in repository</tspan></text> 41.283 + <rect 41.284 + y="245.94225" 41.285 + x="557.28418" 41.286 + height="204.51619" 41.287 + width="174.36833" 41.288 + id="rect6140" 41.289 + 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" /> 41.290 + <g 41.291 + id="g6130" 41.292 + transform="translate(262.3254,24.38544)"> 41.293 + <rect 41.294 + 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" 41.295 + id="rect6106" 41.296 + width="134.53746" 41.297 + height="44.537449" 41.298 + x="314.87415" 41.299 + y="257.95059" /> 41.300 + <text 41.301 + xml:space="preserve" 41.302 + 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" 41.303 + x="339.55664" 41.304 + y="283.7113" 41.305 + id="text6108"><tspan 41.306 + sodipodi:role="line" 41.307 + id="tspan6110" 41.308 + x="339.55664" 41.309 + y="283.7113" 41.310 + style="font-family:Courier">dfbbb33f3fa3</tspan></text> 41.311 + </g> 41.312 + <g 41.313 + id="g6135" 41.314 + transform="translate(263.0396,49.83106)"> 41.315 + <rect 41.316 + inkscape:transform-center-y="102.85714" 41.317 + inkscape:transform-center-x="129.28571" 41.318 + 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" 41.319 + id="rect6112" 41.320 + width="134.53746" 41.321 + height="44.537449" 41.322 + x="314.15985" 41.323 + y="326.52203" /> 41.324 + <text 41.325 + inkscape:transform-center-y="102.7311" 41.326 + inkscape:transform-center-x="128.69672" 41.327 + xml:space="preserve" 41.328 + 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" 41.329 + x="338.84335" 41.330 + y="352.28271" 41.331 + id="text6114"><tspan 41.332 + sodipodi:role="line" 41.333 + id="tspan6116" 41.334 + x="338.84335" 41.335 + y="352.28271" 41.336 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 41.337 + </g> 41.338 + <text 41.339 + xml:space="preserve" 41.340 + 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" 41.341 + x="576.63208" 41.342 + y="270.479" 41.343 + id="text6118"><tspan 41.344 + sodipodi:role="line" 41.345 + id="tspan6120" 41.346 + x="576.63208" 41.347 + y="270.479">First parent</tspan></text> 41.348 + <text 41.349 + xml:space="preserve" 41.350 + 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" 41.351 + x="576.07544" 41.352 + y="364.49615" 41.353 + id="text6122"><tspan 41.354 + sodipodi:role="line" 41.355 + id="tspan6124" 41.356 + x="576.07544" 41.357 + y="364.49615">Second parent</tspan></text> 41.358 + <text 41.359 + xml:space="preserve" 41.360 + 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" 41.361 + x="556.61743" 41.362 + y="231.36218" 41.363 + id="text6195"><tspan 41.364 + sodipodi:role="line" 41.365 + id="tspan6197" 41.366 + x="556.61743" 41.367 + y="231.36218">Parents of working directory</tspan></text> 41.368 + <path 41.369 + 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" 41.370 + d="M 576.82542,297.63008 L 483.02528,287.95831" 41.371 + id="path6266" 41.372 + inkscape:connector-type="polyline" 41.373 + inkscape:connection-start="#g6130" 41.374 + inkscape:connection-end="#g6261" /> 41.375 + <path 41.376 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 41.377 + d="M 665.12232,418.17579 L 665.12232,418.17579" 41.378 + id="path6270" 41.379 + inkscape:connector-type="polyline" /> 41.380 + <text 41.381 + xml:space="preserve" 41.382 + 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" 41.383 + x="316.86407" 41.384 + y="275.6496" 41.385 + id="text6573"><tspan 41.386 + sodipodi:role="line" 41.387 + id="tspan6575" 41.388 + x="316.86407" 41.389 + y="275.6496" 41.390 + style="text-align:end;text-anchor:end">New</tspan><tspan 41.391 + sodipodi:role="line" 41.392 + x="316.86407" 41.393 + y="290.6496" 41.394 + id="tspan6577" 41.395 + style="text-align:end;text-anchor:end">changeset</tspan></text> 41.396 + </g> 41.397 +</svg>
42.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 42.2 +++ b/en/images/wdir-branch.svg Thu Mar 12 15:58:38 2009 +0800 42.3 @@ -0,0 +1,418 @@ 42.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 42.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 42.6 +<svg 42.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 42.8 + xmlns:cc="http://web.resource.org/cc/" 42.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 42.10 + xmlns:svg="http://www.w3.org/2000/svg" 42.11 + xmlns="http://www.w3.org/2000/svg" 42.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 42.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 42.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 42.15 + width="744.09448819" 42.16 + height="1052.3622047" 42.17 + id="svg5971" 42.18 + sodipodi:version="0.32" 42.19 + inkscape:version="0.44.1" 42.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 42.21 + sodipodi:docname="wdir-branch.svg"> 42.22 + <defs 42.23 + id="defs5973"> 42.24 + <marker 42.25 + inkscape:stockid="Arrow1Mstart" 42.26 + orient="auto" 42.27 + refY="0.0" 42.28 + refX="0.0" 42.29 + id="Arrow1Mstart" 42.30 + style="overflow:visible"> 42.31 + <path 42.32 + id="path4855" 42.33 + 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 " 42.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 42.35 + transform="scale(0.4) translate(10,0)" /> 42.36 + </marker> 42.37 + <linearGradient 42.38 + id="linearGradient6049"> 42.39 + <stop 42.40 + style="stop-color:#686868;stop-opacity:1;" 42.41 + offset="0" 42.42 + id="stop6051" /> 42.43 + <stop 42.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 42.45 + offset="1" 42.46 + id="stop6053" /> 42.47 + </linearGradient> 42.48 + <marker 42.49 + inkscape:stockid="Arrow1Mend" 42.50 + orient="auto" 42.51 + refY="0.0" 42.52 + refX="0.0" 42.53 + id="Arrow1Mend" 42.54 + style="overflow:visible;"> 42.55 + <path 42.56 + id="path4852" 42.57 + 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 " 42.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 42.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 42.60 + </marker> 42.61 + <linearGradient 42.62 + inkscape:collect="always" 42.63 + xlink:href="#linearGradient6049" 42.64 + id="linearGradient6083" 42.65 + gradientUnits="userSpaceOnUse" 42.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 42.67 + x1="333.91171" 42.68 + y1="488.79077" 42.69 + x2="508.94543" 42.70 + y2="263.79077" /> 42.71 + <linearGradient 42.72 + inkscape:collect="always" 42.73 + xlink:href="#linearGradient6049" 42.74 + id="linearGradient6142" 42.75 + gradientUnits="userSpaceOnUse" 42.76 + gradientTransform="translate(-42.00893,-30.49544)" 42.77 + x1="333.91171" 42.78 + y1="488.79077" 42.79 + x2="508.94543" 42.80 + y2="263.79077" /> 42.81 + <linearGradient 42.82 + inkscape:collect="always" 42.83 + xlink:href="#linearGradient6049" 42.84 + id="linearGradient6193" 42.85 + gradientUnits="userSpaceOnUse" 42.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 42.87 + x1="333.91171" 42.88 + y1="488.79077" 42.89 + x2="508.94543" 42.90 + y2="263.79077" /> 42.91 + <linearGradient 42.92 + inkscape:collect="always" 42.93 + xlink:href="#linearGradient6049" 42.94 + id="linearGradient6216" 42.95 + gradientUnits="userSpaceOnUse" 42.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 42.97 + x1="333.91171" 42.98 + y1="488.79077" 42.99 + x2="508.94543" 42.100 + y2="263.79077" /> 42.101 + <linearGradient 42.102 + inkscape:collect="always" 42.103 + xlink:href="#linearGradient6049" 42.104 + id="linearGradient6232" 42.105 + gradientUnits="userSpaceOnUse" 42.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 42.107 + x1="333.91171" 42.108 + y1="488.79077" 42.109 + x2="508.94543" 42.110 + y2="263.79077" /> 42.111 + <linearGradient 42.112 + inkscape:collect="always" 42.113 + xlink:href="#linearGradient6049" 42.114 + id="linearGradient6445" 42.115 + gradientUnits="userSpaceOnUse" 42.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 42.117 + x1="333.91171" 42.118 + y1="488.79077" 42.119 + x2="508.94543" 42.120 + y2="263.79077" /> 42.121 + <linearGradient 42.122 + inkscape:collect="always" 42.123 + xlink:href="#linearGradient6049" 42.124 + id="linearGradient6974" 42.125 + gradientUnits="userSpaceOnUse" 42.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 42.127 + x1="333.91171" 42.128 + y1="488.79077" 42.129 + x2="508.94543" 42.130 + y2="263.79077" /> 42.131 + <linearGradient 42.132 + inkscape:collect="always" 42.133 + xlink:href="#linearGradient6049" 42.134 + id="linearGradient6996" 42.135 + gradientUnits="userSpaceOnUse" 42.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 42.137 + x1="333.91171" 42.138 + y1="488.79077" 42.139 + x2="508.94543" 42.140 + y2="263.79077" /> 42.141 + </defs> 42.142 + <sodipodi:namedview 42.143 + id="base" 42.144 + pagecolor="#ffffff" 42.145 + bordercolor="#666666" 42.146 + borderopacity="1.0" 42.147 + gridtolerance="10000" 42.148 + guidetolerance="10" 42.149 + objecttolerance="10" 42.150 + inkscape:pageopacity="0.0" 42.151 + inkscape:pageshadow="2" 42.152 + inkscape:zoom="0.90509668" 42.153 + inkscape:cx="345.85973" 42.154 + inkscape:cy="690.49342" 42.155 + inkscape:document-units="px" 42.156 + inkscape:current-layer="layer1" 42.157 + showguides="true" 42.158 + inkscape:guide-bbox="true" 42.159 + inkscape:window-width="906" 42.160 + inkscape:window-height="620" 42.161 + inkscape:window-x="0" 42.162 + inkscape:window-y="25"> 42.163 + <sodipodi:guide 42.164 + orientation="vertical" 42.165 + position="-1.4285714" 42.166 + id="guide6022" /> 42.167 + </sodipodi:namedview> 42.168 + <metadata 42.169 + id="metadata5976"> 42.170 + <rdf:RDF> 42.171 + <cc:Work 42.172 + rdf:about=""> 42.173 + <dc:format>image/svg+xml</dc:format> 42.174 + <dc:type 42.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 42.176 + </cc:Work> 42.177 + </rdf:RDF> 42.178 + </metadata> 42.179 + <g 42.180 + inkscape:label="Layer 1" 42.181 + inkscape:groupmode="layer" 42.182 + id="layer1"> 42.183 + <rect 42.184 + y="246.06918" 42.185 + x="64.325172" 42.186 + height="204.26233" 42.187 + width="333.2135" 42.188 + id="rect6047" 42.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 42.190 + <g 42.191 + id="g1935"> 42.192 + <rect 42.193 + y="266.24374" 42.194 + x="84.113708" 42.195 + height="44.537449" 42.196 + width="134.53746" 42.197 + id="rect5996" 42.198 + 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" /> 42.199 + <text 42.200 + id="text5998" 42.201 + y="292.00446" 42.202 + x="108.7962" 42.203 + 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" 42.204 + xml:space="preserve"><tspan 42.205 + style="font-family:Courier" 42.206 + y="292.00446" 42.207 + x="108.7962" 42.208 + id="tspan6000" 42.209 + sodipodi:role="line">e7639888bb2f</tspan></text> 42.210 + </g> 42.211 + <g 42.212 + id="g6976" 42.213 + transform="translate(70,0)"> 42.214 + <rect 42.215 + y="327.9104" 42.216 + x="40.113693" 42.217 + height="44.537449" 42.218 + width="134.53746" 42.219 + id="rect6004" 42.220 + 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" /> 42.221 + <text 42.222 + id="text6006" 42.223 + y="353.67111" 42.224 + x="62.654205" 42.225 + 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" 42.226 + xml:space="preserve"><tspan 42.227 + style="font-family:Courier" 42.228 + y="353.67111" 42.229 + x="62.654205" 42.230 + id="tspan6008" 42.231 + sodipodi:role="line">7b064d8bac5e</tspan></text> 42.232 + </g> 42.233 + <path 42.234 + inkscape:connector-type="polyline" 42.235 + id="path6020" 42.236 + d="M 160.92915,311.15532 L 167.83571,327.53627" 42.237 + 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;display:inline" 42.238 + inkscape:connection-end="#g6976" 42.239 + inkscape:connection-start="#g1935" /> 42.240 + <rect 42.241 + 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" 42.242 + id="rect6039" 42.243 + width="134.53746" 42.244 + height="44.537449" 42.245 + x="110.11359" 42.246 + y="389.57703" /> 42.247 + <text 42.248 + xml:space="preserve" 42.249 + 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" 42.250 + x="134.79706" 42.251 + y="415.33771" 42.252 + id="text6041"><tspan 42.253 + sodipodi:role="line" 42.254 + id="tspan6043" 42.255 + x="134.79706" 42.256 + y="415.33771" 42.257 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 42.258 + <path 42.259 + inkscape:connection-end="#rect6039" 42.260 + inkscape:connector-type="polyline" 42.261 + id="path6045" 42.262 + d="M 177.38238,372.82195 L 177.38235,389.20303" 42.263 + 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" /> 42.264 + <rect 42.265 + y="245.94225" 42.266 + x="447.28412" 42.267 + height="204.51619" 42.268 + width="174.36833" 42.269 + id="rect6140" 42.270 + style="fill:url(#linearGradient6996);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" /> 42.271 + <g 42.272 + id="g6130" 42.273 + transform="translate(152.3254,24.38544)"> 42.274 + <rect 42.275 + 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" 42.276 + id="rect6106" 42.277 + width="134.53746" 42.278 + height="44.537449" 42.279 + x="314.87415" 42.280 + y="257.95059" /> 42.281 + <text 42.282 + xml:space="preserve" 42.283 + 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" 42.284 + x="339.55664" 42.285 + y="283.7113" 42.286 + id="text6108"><tspan 42.287 + sodipodi:role="line" 42.288 + id="tspan6110" 42.289 + x="339.55664" 42.290 + y="283.7113" 42.291 + style="font-family:Courier">ffb20e1701ea</tspan></text> 42.292 + </g> 42.293 + <g 42.294 + id="g6135" 42.295 + transform="translate(153.0396,49.83106)"> 42.296 + <rect 42.297 + inkscape:transform-center-y="102.85714" 42.298 + inkscape:transform-center-x="129.28571" 42.299 + 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" 42.300 + id="rect6112" 42.301 + width="134.53746" 42.302 + height="44.537449" 42.303 + x="314.15985" 42.304 + y="326.52203" /> 42.305 + <text 42.306 + inkscape:transform-center-y="102.7311" 42.307 + inkscape:transform-center-x="128.69672" 42.308 + xml:space="preserve" 42.309 + 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" 42.310 + x="338.84335" 42.311 + y="352.28271" 42.312 + id="text6114"><tspan 42.313 + sodipodi:role="line" 42.314 + id="tspan6116" 42.315 + x="338.84335" 42.316 + y="352.28271" 42.317 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 42.318 + </g> 42.319 + <text 42.320 + xml:space="preserve" 42.321 + 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" 42.322 + x="466.63208" 42.323 + y="270.479" 42.324 + id="text6118"><tspan 42.325 + sodipodi:role="line" 42.326 + id="tspan6120" 42.327 + x="466.63208" 42.328 + y="270.479">First parent</tspan></text> 42.329 + <text 42.330 + xml:space="preserve" 42.331 + 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" 42.332 + x="466.07544" 42.333 + y="364.49615" 42.334 + id="text6122"><tspan 42.335 + sodipodi:role="line" 42.336 + id="tspan6124" 42.337 + x="466.07544" 42.338 + y="364.49615">Second parent</tspan></text> 42.339 + <text 42.340 + xml:space="preserve" 42.341 + 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" 42.342 + x="446.61743" 42.343 + y="231.36218" 42.344 + id="text6195"><tspan 42.345 + sodipodi:role="line" 42.346 + id="tspan6197" 42.347 + x="446.61743" 42.348 + y="231.36218">Parents of working directory</tspan></text> 42.349 + <path 42.350 + 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;display:inline" 42.351 + d="M 466.82542,300.21999 L 377.00207,294.39744" 42.352 + id="path6266" 42.353 + inkscape:connector-type="polyline" 42.354 + inkscape:connection-start="#g6130" 42.355 + inkscape:connection-end="#rect1925" /> 42.356 + <path 42.357 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 42.358 + d="M 665.12232,418.17579 L 665.12232,418.17579" 42.359 + id="path6270" 42.360 + inkscape:connector-type="polyline" /> 42.361 + <g 42.362 + id="g2845"> 42.363 + <rect 42.364 + y="266.24374" 42.365 + x="242.09048" 42.366 + height="44.537449" 42.367 + width="134.53746" 42.368 + id="rect1925" 42.369 + style="fill:#9f9f9f;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" /> 42.370 + <text 42.371 + id="text1927" 42.372 + y="292.00446" 42.373 + x="266.77298" 42.374 + 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" 42.375 + xml:space="preserve"><tspan 42.376 + style="font-family:Courier" 42.377 + y="292.00446" 42.378 + x="266.77298" 42.379 + id="tspan1929" 42.380 + sodipodi:role="line">ffb20e1701ea</tspan></text> 42.381 + </g> 42.382 + <path 42.383 + inkscape:connector-type="polyline" 42.384 + id="path1933" 42.385 + d="M 260.89978,311.15532 L 225.84185,327.53627" 42.386 + 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;display:inline" 42.387 + inkscape:connection-end="#g6976" /> 42.388 + <text 42.389 + xml:space="preserve" 42.390 + 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" 42.391 + x="109.45568" 42.392 + y="231.4554" 42.393 + id="text2837"><tspan 42.394 + sodipodi:role="line" 42.395 + id="tspan2839" 42.396 + x="109.45568" 42.397 + y="231.4554">Pre-existing head</tspan></text> 42.398 + <text 42.399 + xml:space="preserve" 42.400 + 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" 42.401 + x="237.54184" 42.402 + y="231.4554" 42.403 + id="text2841"><tspan 42.404 + sodipodi:role="line" 42.405 + id="tspan2843" 42.406 + x="237.54184" 42.407 + y="231.4554">Newly created head (and tip)</tspan></text> 42.408 + <path 42.409 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 42.410 + d="M 148.05048,235.87482 L 149.94915,265.86962" 42.411 + id="path2850" 42.412 + inkscape:connector-type="polyline" 42.413 + inkscape:connection-end="#g1935" /> 42.414 + <path 42.415 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 42.416 + d="M 303.83495,238.08453 L 306.87874,265.86962" 42.417 + id="path2852" 42.418 + inkscape:connector-type="polyline" 42.419 + inkscape:connection-end="#g2845" /> 42.420 + </g> 42.421 +</svg>
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 43.2 +++ b/en/images/wdir-merge.svg Thu Mar 12 15:58:38 2009 +0800 43.3 @@ -0,0 +1,425 @@ 43.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 43.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 43.6 +<svg 43.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 43.8 + xmlns:cc="http://web.resource.org/cc/" 43.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 43.10 + xmlns:svg="http://www.w3.org/2000/svg" 43.11 + xmlns="http://www.w3.org/2000/svg" 43.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 43.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 43.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 43.15 + width="744.09448819" 43.16 + height="1052.3622047" 43.17 + id="svg5971" 43.18 + sodipodi:version="0.32" 43.19 + inkscape:version="0.44.1" 43.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 43.21 + sodipodi:docname="wdir-merge.svg"> 43.22 + <defs 43.23 + id="defs5973"> 43.24 + <marker 43.25 + inkscape:stockid="Arrow1Mstart" 43.26 + orient="auto" 43.27 + refY="0.0" 43.28 + refX="0.0" 43.29 + id="Arrow1Mstart" 43.30 + style="overflow:visible"> 43.31 + <path 43.32 + id="path4855" 43.33 + 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 " 43.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 43.35 + transform="scale(0.4) translate(10,0)" /> 43.36 + </marker> 43.37 + <linearGradient 43.38 + id="linearGradient6049"> 43.39 + <stop 43.40 + style="stop-color:#686868;stop-opacity:1;" 43.41 + offset="0" 43.42 + id="stop6051" /> 43.43 + <stop 43.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 43.45 + offset="1" 43.46 + id="stop6053" /> 43.47 + </linearGradient> 43.48 + <marker 43.49 + inkscape:stockid="Arrow1Mend" 43.50 + orient="auto" 43.51 + refY="0.0" 43.52 + refX="0.0" 43.53 + id="Arrow1Mend" 43.54 + style="overflow:visible;"> 43.55 + <path 43.56 + id="path4852" 43.57 + 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 " 43.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 43.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 43.60 + </marker> 43.61 + <linearGradient 43.62 + inkscape:collect="always" 43.63 + xlink:href="#linearGradient6049" 43.64 + id="linearGradient6083" 43.65 + gradientUnits="userSpaceOnUse" 43.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 43.67 + x1="333.91171" 43.68 + y1="488.79077" 43.69 + x2="508.94543" 43.70 + y2="263.79077" /> 43.71 + <linearGradient 43.72 + inkscape:collect="always" 43.73 + xlink:href="#linearGradient6049" 43.74 + id="linearGradient6142" 43.75 + gradientUnits="userSpaceOnUse" 43.76 + gradientTransform="translate(-42.00893,-30.49544)" 43.77 + x1="333.91171" 43.78 + y1="488.79077" 43.79 + x2="508.94543" 43.80 + y2="263.79077" /> 43.81 + <linearGradient 43.82 + inkscape:collect="always" 43.83 + xlink:href="#linearGradient6049" 43.84 + id="linearGradient6193" 43.85 + gradientUnits="userSpaceOnUse" 43.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 43.87 + x1="333.91171" 43.88 + y1="488.79077" 43.89 + x2="508.94543" 43.90 + y2="263.79077" /> 43.91 + <linearGradient 43.92 + inkscape:collect="always" 43.93 + xlink:href="#linearGradient6049" 43.94 + id="linearGradient6216" 43.95 + gradientUnits="userSpaceOnUse" 43.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 43.97 + x1="333.91171" 43.98 + y1="488.79077" 43.99 + x2="508.94543" 43.100 + y2="263.79077" /> 43.101 + <linearGradient 43.102 + inkscape:collect="always" 43.103 + xlink:href="#linearGradient6049" 43.104 + id="linearGradient6232" 43.105 + gradientUnits="userSpaceOnUse" 43.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 43.107 + x1="333.91171" 43.108 + y1="488.79077" 43.109 + x2="508.94543" 43.110 + y2="263.79077" /> 43.111 + <linearGradient 43.112 + inkscape:collect="always" 43.113 + xlink:href="#linearGradient6049" 43.114 + id="linearGradient6445" 43.115 + gradientUnits="userSpaceOnUse" 43.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 43.117 + x1="333.91171" 43.118 + y1="488.79077" 43.119 + x2="508.94543" 43.120 + y2="263.79077" /> 43.121 + <linearGradient 43.122 + inkscape:collect="always" 43.123 + xlink:href="#linearGradient6049" 43.124 + id="linearGradient6974" 43.125 + gradientUnits="userSpaceOnUse" 43.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 43.127 + x1="333.91171" 43.128 + y1="488.79077" 43.129 + x2="508.94543" 43.130 + y2="263.79077" /> 43.131 + <linearGradient 43.132 + inkscape:collect="always" 43.133 + xlink:href="#linearGradient6049" 43.134 + id="linearGradient6996" 43.135 + gradientUnits="userSpaceOnUse" 43.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 43.137 + x1="333.91171" 43.138 + y1="488.79077" 43.139 + x2="508.94543" 43.140 + y2="263.79077" /> 43.141 + </defs> 43.142 + <sodipodi:namedview 43.143 + id="base" 43.144 + pagecolor="#ffffff" 43.145 + bordercolor="#666666" 43.146 + borderopacity="1.0" 43.147 + gridtolerance="10000" 43.148 + guidetolerance="10" 43.149 + objecttolerance="10" 43.150 + inkscape:pageopacity="0.0" 43.151 + inkscape:pageshadow="2" 43.152 + inkscape:zoom="1.28" 43.153 + inkscape:cx="345.85973" 43.154 + inkscape:cy="690.49342" 43.155 + inkscape:document-units="px" 43.156 + inkscape:current-layer="layer1" 43.157 + showguides="true" 43.158 + inkscape:guide-bbox="true" 43.159 + inkscape:window-width="906" 43.160 + inkscape:window-height="620" 43.161 + inkscape:window-x="0" 43.162 + inkscape:window-y="25"> 43.163 + <sodipodi:guide 43.164 + orientation="vertical" 43.165 + position="-1.4285714" 43.166 + id="guide6022" /> 43.167 + </sodipodi:namedview> 43.168 + <metadata 43.169 + id="metadata5976"> 43.170 + <rdf:RDF> 43.171 + <cc:Work 43.172 + rdf:about=""> 43.173 + <dc:format>image/svg+xml</dc:format> 43.174 + <dc:type 43.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 43.176 + </cc:Work> 43.177 + </rdf:RDF> 43.178 + </metadata> 43.179 + <g 43.180 + inkscape:label="Layer 1" 43.181 + inkscape:groupmode="layer" 43.182 + id="layer1"> 43.183 + <rect 43.184 + y="246.06918" 43.185 + x="64.325172" 43.186 + height="204.26233" 43.187 + width="333.2135" 43.188 + id="rect6047" 43.189 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 43.190 + <g 43.191 + id="g6976" 43.192 + transform="translate(70,0)"> 43.193 + <rect 43.194 + y="327.9104" 43.195 + x="40.113693" 43.196 + height="44.537449" 43.197 + width="134.53746" 43.198 + id="rect6004" 43.199 + 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" /> 43.200 + <text 43.201 + id="text6006" 43.202 + y="353.67111" 43.203 + x="62.654205" 43.204 + 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" 43.205 + xml:space="preserve"><tspan 43.206 + style="font-family:Courier" 43.207 + y="353.67111" 43.208 + x="62.654205" 43.209 + id="tspan6008" 43.210 + sodipodi:role="line">7b064d8bac5e</tspan></text> 43.211 + </g> 43.212 + <path 43.213 + inkscape:connector-type="polyline" 43.214 + id="path6020" 43.215 + d="M 160.92915,311.15532 L 167.83571,327.53627" 43.216 + 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;display:inline" 43.217 + inkscape:connection-end="#g6976" 43.218 + inkscape:connection-start="#g1935" /> 43.219 + <rect 43.220 + 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" 43.221 + id="rect6039" 43.222 + width="134.53746" 43.223 + height="44.537449" 43.224 + x="110.11359" 43.225 + y="389.57703" /> 43.226 + <text 43.227 + xml:space="preserve" 43.228 + 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" 43.229 + x="134.79706" 43.230 + y="415.33771" 43.231 + id="text6041"><tspan 43.232 + sodipodi:role="line" 43.233 + id="tspan6043" 43.234 + x="134.79706" 43.235 + y="415.33771" 43.236 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 43.237 + <path 43.238 + inkscape:connection-end="#rect6039" 43.239 + inkscape:connector-type="polyline" 43.240 + id="path6045" 43.241 + d="M 177.38238,372.82195 L 177.38235,389.20303" 43.242 + 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" /> 43.243 + <rect 43.244 + y="245.94225" 43.245 + x="447.28412" 43.246 + height="204.51619" 43.247 + width="174.36833" 43.248 + id="rect6140" 43.249 + style="fill:url(#linearGradient6996);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" /> 43.250 + <g 43.251 + id="g6130" 43.252 + transform="translate(152.3254,24.38544)"> 43.253 + <rect 43.254 + 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" 43.255 + id="rect6106" 43.256 + width="134.53746" 43.257 + height="44.537449" 43.258 + x="314.87415" 43.259 + y="257.95059" /> 43.260 + <text 43.261 + xml:space="preserve" 43.262 + 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" 43.263 + x="339.55664" 43.264 + y="283.7113" 43.265 + id="text6108"><tspan 43.266 + sodipodi:role="line" 43.267 + id="tspan6110" 43.268 + x="339.55664" 43.269 + y="283.7113" 43.270 + style="font-family:Courier">ffb20e1701ea</tspan></text> 43.271 + </g> 43.272 + <g 43.273 + id="g6135" 43.274 + transform="translate(153.0396,49.83106)"> 43.275 + <rect 43.276 + inkscape:transform-center-y="102.85714" 43.277 + inkscape:transform-center-x="129.28571" 43.278 + style="fill:#d4d4d4;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" 43.279 + id="rect6112" 43.280 + width="134.53746" 43.281 + height="44.537449" 43.282 + x="314.15985" 43.283 + y="326.52203" /> 43.284 + <text 43.285 + inkscape:transform-center-y="102.7311" 43.286 + inkscape:transform-center-x="128.69672" 43.287 + xml:space="preserve" 43.288 + 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" 43.289 + x="338.84335" 43.290 + y="352.28271" 43.291 + id="text6114"><tspan 43.292 + sodipodi:role="line" 43.293 + id="tspan6116" 43.294 + x="338.84335" 43.295 + y="352.28271" 43.296 + style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 43.297 + </g> 43.298 + <text 43.299 + xml:space="preserve" 43.300 + 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" 43.301 + x="466.63208" 43.302 + y="270.479" 43.303 + id="text6118"><tspan 43.304 + sodipodi:role="line" 43.305 + id="tspan6120" 43.306 + x="466.63208" 43.307 + y="270.479">First parent (unchanged)</tspan></text> 43.308 + <text 43.309 + xml:space="preserve" 43.310 + 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" 43.311 + x="466.07544" 43.312 + y="364.49615" 43.313 + id="text6122"><tspan 43.314 + sodipodi:role="line" 43.315 + id="tspan6124" 43.316 + x="466.07544" 43.317 + y="364.49615">Second parent</tspan></text> 43.318 + <text 43.319 + xml:space="preserve" 43.320 + 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" 43.321 + x="446.61743" 43.322 + y="231.36218" 43.323 + id="text6195"><tspan 43.324 + sodipodi:role="line" 43.325 + id="tspan6197" 43.326 + x="446.61743" 43.327 + y="231.36218">Parents of working directory</tspan></text> 43.328 + <path 43.329 + 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;display:inline" 43.330 + d="M 466.82542,300.21999 L 377.00207,294.39744" 43.331 + id="path6266" 43.332 + inkscape:connector-type="polyline" 43.333 + inkscape:connection-start="#g6130" 43.334 + inkscape:connection-end="#rect1925" /> 43.335 + <path 43.336 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 43.337 + d="M 665.12232,418.17579 L 665.12232,418.17579" 43.338 + id="path6270" 43.339 + inkscape:connector-type="polyline" /> 43.340 + <g 43.341 + id="g2845"> 43.342 + <rect 43.343 + y="266.24374" 43.344 + x="242.09048" 43.345 + height="44.537449" 43.346 + width="134.53746" 43.347 + id="rect1925" 43.348 + style="fill:#9f9f9f;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" /> 43.349 + <text 43.350 + id="text1927" 43.351 + y="292.00446" 43.352 + x="266.77298" 43.353 + 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" 43.354 + xml:space="preserve"><tspan 43.355 + style="font-family:Courier" 43.356 + y="292.00446" 43.357 + x="266.77298" 43.358 + id="tspan1929" 43.359 + sodipodi:role="line">ffb20e1701ea</tspan></text> 43.360 + </g> 43.361 + <path 43.362 + inkscape:connector-type="polyline" 43.363 + id="path1933" 43.364 + d="M 260.89978,311.15532 L 225.84185,327.53627" 43.365 + 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;display:inline" 43.366 + inkscape:connection-end="#g6976" /> 43.367 + <text 43.368 + xml:space="preserve" 43.369 + 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" 43.370 + x="109.45568" 43.371 + y="231.4554" 43.372 + id="text2837"><tspan 43.373 + sodipodi:role="line" 43.374 + id="tspan2839" 43.375 + x="109.45568" 43.376 + y="231.4554">Pre-existing head</tspan></text> 43.377 + <text 43.378 + xml:space="preserve" 43.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" 43.380 + x="237.54184" 43.381 + y="231.4554" 43.382 + id="text2841"><tspan 43.383 + sodipodi:role="line" 43.384 + id="tspan2843" 43.385 + x="237.54184" 43.386 + y="231.4554">Newly created head (and tip)</tspan></text> 43.387 + <path 43.388 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 43.389 + d="M 148.05048,235.87482 L 149.94915,265.86962" 43.390 + id="path2850" 43.391 + inkscape:connector-type="polyline" 43.392 + inkscape:connection-end="#g1935" /> 43.393 + <path 43.394 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 43.395 + d="M 303.83495,238.08453 L 306.87874,265.86962" 43.396 + id="path2852" 43.397 + inkscape:connector-type="polyline" 43.398 + inkscape:connection-end="#g2845" /> 43.399 + <path 43.400 + 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;display:inline" 43.401 + d="M 466.82545,379.17944 L 219.0253,307.95488" 43.402 + id="path3016" 43.403 + inkscape:connector-type="polyline" 43.404 + inkscape:connection-start="#g6135" 43.405 + inkscape:connection-end="#g1935" /> 43.406 + <g 43.407 + id="g1935"> 43.408 + <rect 43.409 + y="266.24374" 43.410 + x="84.113708" 43.411 + height="44.537449" 43.412 + width="134.53746" 43.413 + id="rect5996" 43.414 + 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" /> 43.415 + <text 43.416 + id="text5998" 43.417 + y="292.00446" 43.418 + x="108.7962" 43.419 + 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" 43.420 + xml:space="preserve"><tspan 43.421 + style="font-family:Courier" 43.422 + y="292.00446" 43.423 + x="108.7962" 43.424 + id="tspan6000" 43.425 + sodipodi:role="line">e7639888bb2f</tspan></text> 43.426 + </g> 43.427 + </g> 43.428 +</svg>
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 44.2 +++ b/en/images/wdir-pre-branch.svg Thu Mar 12 15:58:38 2009 +0800 44.3 @@ -0,0 +1,364 @@ 44.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 44.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 44.6 +<svg 44.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 44.8 + xmlns:cc="http://web.resource.org/cc/" 44.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 44.10 + xmlns:svg="http://www.w3.org/2000/svg" 44.11 + xmlns="http://www.w3.org/2000/svg" 44.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 44.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 44.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 44.15 + width="744.09448819" 44.16 + height="1052.3622047" 44.17 + id="svg5971" 44.18 + sodipodi:version="0.32" 44.19 + inkscape:version="0.44.1" 44.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 44.21 + sodipodi:docname="wdir-branch.svg"> 44.22 + <defs 44.23 + id="defs5973"> 44.24 + <marker 44.25 + inkscape:stockid="Arrow1Mstart" 44.26 + orient="auto" 44.27 + refY="0.0" 44.28 + refX="0.0" 44.29 + id="Arrow1Mstart" 44.30 + style="overflow:visible"> 44.31 + <path 44.32 + id="path4855" 44.33 + 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 " 44.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 44.35 + transform="scale(0.4) translate(10,0)" /> 44.36 + </marker> 44.37 + <linearGradient 44.38 + id="linearGradient6049"> 44.39 + <stop 44.40 + style="stop-color:#686868;stop-opacity:1;" 44.41 + offset="0" 44.42 + id="stop6051" /> 44.43 + <stop 44.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 44.45 + offset="1" 44.46 + id="stop6053" /> 44.47 + </linearGradient> 44.48 + <marker 44.49 + inkscape:stockid="Arrow1Mend" 44.50 + orient="auto" 44.51 + refY="0.0" 44.52 + refX="0.0" 44.53 + id="Arrow1Mend" 44.54 + style="overflow:visible;"> 44.55 + <path 44.56 + id="path4852" 44.57 + 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 " 44.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 44.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 44.60 + </marker> 44.61 + <linearGradient 44.62 + inkscape:collect="always" 44.63 + xlink:href="#linearGradient6049" 44.64 + id="linearGradient6083" 44.65 + gradientUnits="userSpaceOnUse" 44.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 44.67 + x1="333.91171" 44.68 + y1="488.79077" 44.69 + x2="508.94543" 44.70 + y2="263.79077" /> 44.71 + <linearGradient 44.72 + inkscape:collect="always" 44.73 + xlink:href="#linearGradient6049" 44.74 + id="linearGradient6142" 44.75 + gradientUnits="userSpaceOnUse" 44.76 + gradientTransform="translate(-42.00893,-30.49544)" 44.77 + x1="333.91171" 44.78 + y1="488.79077" 44.79 + x2="508.94543" 44.80 + y2="263.79077" /> 44.81 + <linearGradient 44.82 + inkscape:collect="always" 44.83 + xlink:href="#linearGradient6049" 44.84 + id="linearGradient6193" 44.85 + gradientUnits="userSpaceOnUse" 44.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 44.87 + x1="333.91171" 44.88 + y1="488.79077" 44.89 + x2="508.94543" 44.90 + y2="263.79077" /> 44.91 + <linearGradient 44.92 + inkscape:collect="always" 44.93 + xlink:href="#linearGradient6049" 44.94 + id="linearGradient6216" 44.95 + gradientUnits="userSpaceOnUse" 44.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 44.97 + x1="333.91171" 44.98 + y1="488.79077" 44.99 + x2="508.94543" 44.100 + y2="263.79077" /> 44.101 + <linearGradient 44.102 + inkscape:collect="always" 44.103 + xlink:href="#linearGradient6049" 44.104 + id="linearGradient6232" 44.105 + gradientUnits="userSpaceOnUse" 44.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 44.107 + x1="333.91171" 44.108 + y1="488.79077" 44.109 + x2="508.94543" 44.110 + y2="263.79077" /> 44.111 + <linearGradient 44.112 + inkscape:collect="always" 44.113 + xlink:href="#linearGradient6049" 44.114 + id="linearGradient6445" 44.115 + gradientUnits="userSpaceOnUse" 44.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 44.117 + x1="333.91171" 44.118 + y1="488.79077" 44.119 + x2="508.94543" 44.120 + y2="263.79077" /> 44.121 + <linearGradient 44.122 + inkscape:collect="always" 44.123 + xlink:href="#linearGradient6049" 44.124 + id="linearGradient6974" 44.125 + gradientUnits="userSpaceOnUse" 44.126 + gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 44.127 + x1="333.91171" 44.128 + y1="488.79077" 44.129 + x2="508.94543" 44.130 + y2="263.79077" /> 44.131 + <linearGradient 44.132 + inkscape:collect="always" 44.133 + xlink:href="#linearGradient6049" 44.134 + id="linearGradient6996" 44.135 + gradientUnits="userSpaceOnUse" 44.136 + gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 44.137 + x1="333.91171" 44.138 + y1="488.79077" 44.139 + x2="508.94543" 44.140 + y2="263.79077" /> 44.141 + </defs> 44.142 + <sodipodi:namedview 44.143 + id="base" 44.144 + pagecolor="#ffffff" 44.145 + bordercolor="#666666" 44.146 + borderopacity="1.0" 44.147 + gridtolerance="10000" 44.148 + guidetolerance="10" 44.149 + objecttolerance="10" 44.150 + inkscape:pageopacity="0.0" 44.151 + inkscape:pageshadow="2" 44.152 + inkscape:zoom="0.90509668" 44.153 + inkscape:cx="390.0539" 44.154 + inkscape:cy="690.49342" 44.155 + inkscape:document-units="px" 44.156 + inkscape:current-layer="layer1" 44.157 + showguides="true" 44.158 + inkscape:guide-bbox="true" 44.159 + inkscape:window-width="906" 44.160 + inkscape:window-height="620" 44.161 + inkscape:window-x="0" 44.162 + inkscape:window-y="25"> 44.163 + <sodipodi:guide 44.164 + orientation="vertical" 44.165 + position="-1.4285714" 44.166 + id="guide6022" /> 44.167 + </sodipodi:namedview> 44.168 + <metadata 44.169 + id="metadata5976"> 44.170 + <rdf:RDF> 44.171 + <cc:Work 44.172 + rdf:about=""> 44.173 + <dc:format>image/svg+xml</dc:format> 44.174 + <dc:type 44.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 44.176 + </cc:Work> 44.177 + </rdf:RDF> 44.178 + </metadata> 44.179 + <g 44.180 + inkscape:label="Layer 1" 44.181 + inkscape:groupmode="layer" 44.182 + id="layer1"> 44.183 + <rect 44.184 + y="245.94225" 44.185 + x="20.198257" 44.186 + height="204.51619" 44.187 + width="174.36833" 44.188 + id="rect6047" 44.189 + style="fill:url(#linearGradient6974);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" /> 44.190 + <rect 44.191 + 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" 44.192 + id="rect5996" 44.193 + width="134.53746" 44.194 + height="44.537449" 44.195 + x="40.113693" 44.196 + y="266.24374" /> 44.197 + <text 44.198 + xml:space="preserve" 44.199 + 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" 44.200 + x="64.796204" 44.201 + y="292.00446" 44.202 + id="text5998"><tspan 44.203 + sodipodi:role="line" 44.204 + id="tspan6000" 44.205 + x="64.796204" 44.206 + y="292.00446" 44.207 + style="font-family:Courier">e7639888bb2f</tspan></text> 44.208 + <g 44.209 + id="g6976"> 44.210 + <rect 44.211 + y="327.9104" 44.212 + x="40.113693" 44.213 + height="44.537449" 44.214 + width="134.53746" 44.215 + id="rect6004" 44.216 + 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" /> 44.217 + <text 44.218 + id="text6006" 44.219 + y="353.67111" 44.220 + x="62.654205" 44.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" 44.222 + xml:space="preserve"><tspan 44.223 + style="font-family:Courier" 44.224 + y="353.67111" 44.225 + x="62.654205" 44.226 + id="tspan6008" 44.227 + sodipodi:role="line">7b064d8bac5e</tspan></text> 44.228 + </g> 44.229 + <path 44.230 + inkscape:connection-end="#rect6004" 44.231 + inkscape:connector-type="polyline" 44.232 + id="path6020" 44.233 + d="M 107.38242,311.15529 L 107.38242,327.53626" 44.234 + 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" /> 44.235 + <rect 44.236 + 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" 44.237 + id="rect6039" 44.238 + width="134.53746" 44.239 + height="44.537449" 44.240 + x="40.113571" 44.241 + y="389.57703" /> 44.242 + <text 44.243 + xml:space="preserve" 44.244 + 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" 44.245 + x="64.797073" 44.246 + y="415.33771" 44.247 + id="text6041"><tspan 44.248 + sodipodi:role="line" 44.249 + id="tspan6043" 44.250 + x="64.797073" 44.251 + y="415.33771" 44.252 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 44.253 + <path 44.254 + inkscape:connection-end="#rect6039" 44.255 + inkscape:connector-type="polyline" 44.256 + id="path6045" 44.257 + d="M 107.38238,372.82195 L 107.38235,389.20301" 44.258 + 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" /> 44.259 + <text 44.260 + xml:space="preserve" 44.261 + 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" 44.262 + x="19.660461" 44.263 + y="231.36218" 44.264 + id="text6102"><tspan 44.265 + sodipodi:role="line" 44.266 + id="tspan6104" 44.267 + x="19.660461" 44.268 + y="231.36218">History in repository</tspan></text> 44.269 + <rect 44.270 + y="245.94225" 44.271 + x="249.28412" 44.272 + height="204.51619" 44.273 + width="174.36833" 44.274 + id="rect6140" 44.275 + style="fill:url(#linearGradient6996);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" /> 44.276 + <g 44.277 + id="g6130" 44.278 + transform="translate(-45.67459,24.38544)"> 44.279 + <rect 44.280 + 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" 44.281 + id="rect6106" 44.282 + width="134.53746" 44.283 + height="44.537449" 44.284 + x="314.87415" 44.285 + y="257.95059" /> 44.286 + <text 44.287 + xml:space="preserve" 44.288 + 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" 44.289 + x="339.55664" 44.290 + y="283.7113" 44.291 + id="text6108"><tspan 44.292 + sodipodi:role="line" 44.293 + id="tspan6110" 44.294 + x="339.55664" 44.295 + y="283.7113" 44.296 + style="font-family:Courier">7b064d8bac5e</tspan></text> 44.297 + </g> 44.298 + <g 44.299 + id="g6135" 44.300 + transform="translate(-44.96042,49.83106)"> 44.301 + <rect 44.302 + inkscape:transform-center-y="102.85714" 44.303 + inkscape:transform-center-x="129.28571" 44.304 + 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" 44.305 + id="rect6112" 44.306 + width="134.53746" 44.307 + height="44.537449" 44.308 + x="314.15985" 44.309 + y="326.52203" /> 44.310 + <text 44.311 + inkscape:transform-center-y="102.7311" 44.312 + inkscape:transform-center-x="128.69672" 44.313 + xml:space="preserve" 44.314 + 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" 44.315 + x="338.84335" 44.316 + y="352.28271" 44.317 + id="text6114"><tspan 44.318 + sodipodi:role="line" 44.319 + id="tspan6116" 44.320 + x="338.84335" 44.321 + y="352.28271" 44.322 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 44.323 + </g> 44.324 + <text 44.325 + xml:space="preserve" 44.326 + 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" 44.327 + x="268.63208" 44.328 + y="270.479" 44.329 + id="text6118"><tspan 44.330 + sodipodi:role="line" 44.331 + id="tspan6120" 44.332 + x="268.63208" 44.333 + y="270.479">First parent</tspan></text> 44.334 + <text 44.335 + xml:space="preserve" 44.336 + 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" 44.337 + x="268.07544" 44.338 + y="364.49615" 44.339 + id="text6122"><tspan 44.340 + sodipodi:role="line" 44.341 + id="tspan6124" 44.342 + x="268.07544" 44.343 + y="364.49615">Second parent</tspan></text> 44.344 + <text 44.345 + xml:space="preserve" 44.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" 44.347 + x="248.61746" 44.348 + y="231.36218" 44.349 + id="text6195"><tspan 44.350 + sodipodi:role="line" 44.351 + id="tspan6197" 44.352 + x="248.61746" 44.353 + y="231.36218">Parents of working directory</tspan></text> 44.354 + <path 44.355 + 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;display:inline" 44.356 + d="M 268.82543,318.06163 L 175.02528,336.72225" 44.357 + id="path6266" 44.358 + inkscape:connector-type="polyline" 44.359 + inkscape:connection-end="#g6976" 44.360 + inkscape:connection-start="#g6130" /> 44.361 + <path 44.362 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 44.363 + d="M 665.12232,418.17579 L 665.12232,418.17579" 44.364 + id="path6270" 44.365 + inkscape:connector-type="polyline" /> 44.366 + </g> 44.367 +</svg>
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 45.2 +++ b/en/images/wdir.svg Thu Mar 12 15:58:38 2009 +0800 45.3 @@ -0,0 +1,348 @@ 45.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 45.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 45.6 +<svg 45.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 45.8 + xmlns:cc="http://web.resource.org/cc/" 45.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 45.10 + xmlns:svg="http://www.w3.org/2000/svg" 45.11 + xmlns="http://www.w3.org/2000/svg" 45.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 45.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 45.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 45.15 + width="744.09448819" 45.16 + height="1052.3622047" 45.17 + id="svg5971" 45.18 + sodipodi:version="0.32" 45.19 + inkscape:version="0.44.1" 45.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 45.21 + sodipodi:docname="wdir.svg"> 45.22 + <defs 45.23 + id="defs5973"> 45.24 + <marker 45.25 + inkscape:stockid="Arrow1Mstart" 45.26 + orient="auto" 45.27 + refY="0.0" 45.28 + refX="0.0" 45.29 + id="Arrow1Mstart" 45.30 + style="overflow:visible"> 45.31 + <path 45.32 + id="path4855" 45.33 + 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 " 45.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 45.35 + transform="scale(0.4) translate(10,0)" /> 45.36 + </marker> 45.37 + <linearGradient 45.38 + id="linearGradient6049"> 45.39 + <stop 45.40 + style="stop-color:#686868;stop-opacity:1;" 45.41 + offset="0" 45.42 + id="stop6051" /> 45.43 + <stop 45.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 45.45 + offset="1" 45.46 + id="stop6053" /> 45.47 + </linearGradient> 45.48 + <marker 45.49 + inkscape:stockid="Arrow1Mend" 45.50 + orient="auto" 45.51 + refY="0.0" 45.52 + refX="0.0" 45.53 + id="Arrow1Mend" 45.54 + style="overflow:visible;"> 45.55 + <path 45.56 + id="path4852" 45.57 + 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 " 45.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 45.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 45.60 + </marker> 45.61 + <linearGradient 45.62 + inkscape:collect="always" 45.63 + xlink:href="#linearGradient6049" 45.64 + id="linearGradient6083" 45.65 + gradientUnits="userSpaceOnUse" 45.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 45.67 + x1="333.91171" 45.68 + y1="488.79077" 45.69 + x2="508.94543" 45.70 + y2="263.79077" /> 45.71 + <linearGradient 45.72 + inkscape:collect="always" 45.73 + xlink:href="#linearGradient6049" 45.74 + id="linearGradient6142" 45.75 + gradientUnits="userSpaceOnUse" 45.76 + gradientTransform="translate(-42.00893,-30.49544)" 45.77 + x1="333.91171" 45.78 + y1="488.79077" 45.79 + x2="508.94543" 45.80 + y2="263.79077" /> 45.81 + <linearGradient 45.82 + inkscape:collect="always" 45.83 + xlink:href="#linearGradient6049" 45.84 + id="linearGradient6193" 45.85 + gradientUnits="userSpaceOnUse" 45.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 45.87 + x1="333.91171" 45.88 + y1="488.79077" 45.89 + x2="508.94543" 45.90 + y2="263.79077" /> 45.91 + <linearGradient 45.92 + inkscape:collect="always" 45.93 + xlink:href="#linearGradient6049" 45.94 + id="linearGradient6216" 45.95 + gradientUnits="userSpaceOnUse" 45.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 45.97 + x1="333.91171" 45.98 + y1="488.79077" 45.99 + x2="508.94543" 45.100 + y2="263.79077" /> 45.101 + <linearGradient 45.102 + inkscape:collect="always" 45.103 + xlink:href="#linearGradient6049" 45.104 + id="linearGradient6232" 45.105 + gradientUnits="userSpaceOnUse" 45.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 45.107 + x1="333.91171" 45.108 + y1="488.79077" 45.109 + x2="508.94543" 45.110 + y2="263.79077" /> 45.111 + <linearGradient 45.112 + inkscape:collect="always" 45.113 + xlink:href="#linearGradient6049" 45.114 + id="linearGradient6445" 45.115 + gradientUnits="userSpaceOnUse" 45.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 45.117 + x1="333.91171" 45.118 + y1="488.79077" 45.119 + x2="508.94543" 45.120 + y2="263.79077" /> 45.121 + </defs> 45.122 + <sodipodi:namedview 45.123 + id="base" 45.124 + pagecolor="#ffffff" 45.125 + bordercolor="#666666" 45.126 + borderopacity="1.0" 45.127 + gridtolerance="10000" 45.128 + guidetolerance="10" 45.129 + objecttolerance="10" 45.130 + inkscape:pageopacity="0.0" 45.131 + inkscape:pageshadow="2" 45.132 + inkscape:zoom="0.90509668" 45.133 + inkscape:cx="390.0539" 45.134 + inkscape:cy="690.49342" 45.135 + inkscape:document-units="px" 45.136 + inkscape:current-layer="layer1" 45.137 + showguides="true" 45.138 + inkscape:guide-bbox="true" 45.139 + inkscape:window-width="906" 45.140 + inkscape:window-height="620" 45.141 + inkscape:window-x="0" 45.142 + inkscape:window-y="25"> 45.143 + <sodipodi:guide 45.144 + orientation="vertical" 45.145 + position="-1.4285714" 45.146 + id="guide6022" /> 45.147 + </sodipodi:namedview> 45.148 + <metadata 45.149 + id="metadata5976"> 45.150 + <rdf:RDF> 45.151 + <cc:Work 45.152 + rdf:about=""> 45.153 + <dc:format>image/svg+xml</dc:format> 45.154 + <dc:type 45.155 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 45.156 + </cc:Work> 45.157 + </rdf:RDF> 45.158 + </metadata> 45.159 + <g 45.160 + inkscape:label="Layer 1" 45.161 + inkscape:groupmode="layer" 45.162 + id="layer1"> 45.163 + <g 45.164 + id="g6431" 45.165 + transform="translate(0,-0.137863)"> 45.166 + <rect 45.167 + style="fill:url(#linearGradient6445);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" 45.168 + id="rect6047" 45.169 + width="174.36833" 45.170 + height="204.51619" 45.171 + x="94.198257" 45.172 + y="246.08011" /> 45.173 + <rect 45.174 + y="266.38159" 45.175 + x="114.11369" 45.176 + height="44.537449" 45.177 + width="134.53746" 45.178 + id="rect5996" 45.179 + 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" /> 45.180 + <text 45.181 + id="text5998" 45.182 + y="292.1423" 45.183 + x="138.7962" 45.184 + 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" 45.185 + xml:space="preserve"><tspan 45.186 + style="font-family:Courier" 45.187 + y="292.1423" 45.188 + x="138.7962" 45.189 + id="tspan6000" 45.190 + sodipodi:role="line">e7639888bb2f</tspan></text> 45.191 + <rect 45.192 + y="328.04825" 45.193 + x="114.11369" 45.194 + height="44.537449" 45.195 + width="134.53746" 45.196 + id="rect6004" 45.197 + 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" /> 45.198 + <text 45.199 + id="text6006" 45.200 + y="353.80896" 45.201 + x="136.65421" 45.202 + 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" 45.203 + xml:space="preserve"><tspan 45.204 + style="font-family:Courier" 45.205 + y="353.80896" 45.206 + x="136.65421" 45.207 + id="tspan6008" 45.208 + sodipodi:role="line">7b064d8bac5e</tspan></text> 45.209 + <path 45.210 + 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" 45.211 + d="M 181.38242,311.29315 L 181.38242,327.67412" 45.212 + id="path6020" 45.213 + inkscape:connector-type="polyline" 45.214 + inkscape:connection-end="#rect6004" /> 45.215 + <rect 45.216 + y="389.71487" 45.217 + x="114.11357" 45.218 + height="44.537449" 45.219 + width="134.53746" 45.220 + id="rect6039" 45.221 + 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" /> 45.222 + <text 45.223 + id="text6041" 45.224 + y="415.47556" 45.225 + x="138.79707" 45.226 + 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" 45.227 + xml:space="preserve"><tspan 45.228 + style="fill:#979797;fill-opacity:1;font-family:Courier" 45.229 + y="415.47556" 45.230 + x="138.79707" 45.231 + id="tspan6043" 45.232 + sodipodi:role="line">000000000000</tspan></text> 45.233 + <path 45.234 + 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" 45.235 + d="M 181.38238,372.95981 L 181.38235,389.34087" 45.236 + id="path6045" 45.237 + inkscape:connector-type="polyline" 45.238 + inkscape:connection-end="#rect6039" /> 45.239 + </g> 45.240 + <text 45.241 + xml:space="preserve" 45.242 + 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" 45.243 + x="93.660484" 45.244 + y="231.36218" 45.245 + id="text6102"><tspan 45.246 + sodipodi:role="line" 45.247 + id="tspan6104" 45.248 + x="93.660484" 45.249 + y="231.36218">History in repository</tspan></text> 45.250 + <g 45.251 + id="g6416"> 45.252 + <rect 45.253 + 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" 45.254 + id="rect6140" 45.255 + width="174.36833" 45.256 + height="204.51619" 45.257 + x="323.28412" 45.258 + y="245.94225" /> 45.259 + <g 45.260 + transform="translate(28.32541,24.38544)" 45.261 + id="g6130"> 45.262 + <rect 45.263 + y="257.95059" 45.264 + x="314.87415" 45.265 + height="44.537449" 45.266 + width="134.53746" 45.267 + id="rect6106" 45.268 + 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" /> 45.269 + <text 45.270 + id="text6108" 45.271 + y="283.7113" 45.272 + x="339.55664" 45.273 + 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" 45.274 + xml:space="preserve"><tspan 45.275 + style="font-family:Courier" 45.276 + y="283.7113" 45.277 + x="339.55664" 45.278 + id="tspan6110" 45.279 + sodipodi:role="line">e7639888bb2f</tspan></text> 45.280 + </g> 45.281 + <g 45.282 + transform="translate(29.03958,49.83106)" 45.283 + id="g6135"> 45.284 + <rect 45.285 + y="326.52203" 45.286 + x="314.15985" 45.287 + height="44.537449" 45.288 + width="134.53746" 45.289 + id="rect6112" 45.290 + 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" 45.291 + inkscape:transform-center-x="129.28571" 45.292 + inkscape:transform-center-y="102.85714" /> 45.293 + <text 45.294 + id="text6114" 45.295 + y="352.28271" 45.296 + x="338.84335" 45.297 + 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" 45.298 + xml:space="preserve" 45.299 + inkscape:transform-center-x="128.69672" 45.300 + inkscape:transform-center-y="102.7311"><tspan 45.301 + style="fill:#979797;fill-opacity:1;font-family:Courier" 45.302 + y="352.28271" 45.303 + x="338.84335" 45.304 + id="tspan6116" 45.305 + sodipodi:role="line">000000000000</tspan></text> 45.306 + </g> 45.307 + <text 45.308 + id="text6118" 45.309 + y="270.479" 45.310 + x="342.63208" 45.311 + 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" 45.312 + xml:space="preserve"><tspan 45.313 + y="270.479" 45.314 + x="342.63208" 45.315 + id="tspan6120" 45.316 + sodipodi:role="line">First parent</tspan></text> 45.317 + <text 45.318 + id="text6122" 45.319 + y="364.49615" 45.320 + x="342.07544" 45.321 + 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" 45.322 + xml:space="preserve"><tspan 45.323 + y="364.49615" 45.324 + x="342.07544" 45.325 + id="tspan6124" 45.326 + sodipodi:role="line">Second parent</tspan></text> 45.327 + </g> 45.328 + <text 45.329 + xml:space="preserve" 45.330 + 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" 45.331 + x="322.61746" 45.332 + y="231.36218" 45.333 + id="text6195"><tspan 45.334 + sodipodi:role="line" 45.335 + id="tspan6197" 45.336 + x="322.61746" 45.337 + y="231.36218">Parents of working directory</tspan></text> 45.338 + <path 45.339 + 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;display:inline" 45.340 + d="M 342.82543,299.89384 L 249.02528,293.36123" 45.341 + id="path6266" 45.342 + inkscape:connector-type="polyline" 45.343 + inkscape:connection-start="#g6130" 45.344 + inkscape:connection-end="#rect5996" /> 45.345 + <path 45.346 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 45.347 + d="M 665.12232,418.17579 L 665.12232,418.17579" 45.348 + id="path6270" 45.349 + inkscape:connector-type="polyline" /> 45.350 + </g> 45.351 +</svg>