hgbook
changeset 575:bebd5ff7fe7f
And there was much tidying, and the result was good.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Mar 10 21:58:03 2009 -0700 (2009-03-10) |
parents | ad304b606163 |
children | 846a41c4fd46 |
files | en/99book.bib en/Makefile en/bookhtml.cfg en/feature-branches.dot 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/filelog.svg en/fixhtml.py en/hgbook.css en/htlatex.book en/kdiff3.png en/metadata.svg en/mq-stack.svg en/note.png en/revlog.svg en/snapshot.svg en/tour-history.svg en/tour-merge-conflict.svg en/tour-merge-merge.svg en/tour-merge-pull.svg en/tour-merge-sep-repos.svg en/undo-manual-merge.dot en/undo-manual.dot en/undo-non-tip.dot en/undo-simple.dot en/wdir-after-commit.svg en/wdir-branch.svg en/wdir-merge.svg en/wdir-pre-branch.svg en/wdir.svg |
line diff
1.1 --- a/en/99book.bib Tue Mar 10 21:42:19 2009 -0700 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,76 +0,0 @@ 1.4 -@Unpublished{gruenbacher:2005, 1.5 - author = {Andreas Gruenbacher}, 1.6 - title = {How To Survive With Many Patches (Introduction to \texttt{quilt})}, 1.7 - year = {2005}, 1.8 - month = {June}, 1.9 - note = {\url{http://www.suse.de/~agruen/quilt.pdf}}, 1.10 -} 1.11 - 1.12 -@InProceedings{web:europython, 1.13 - author = {Bryan O'Sullivan}, 1.14 - title = {Achieving High Performance in Mercurial}, 1.15 - booktitle = {EuroPython Conference}, 1.16 - year = {2006}, 1.17 - month = {July}, 1.18 - note = {\url{XXX}}, 1.19 -} 1.20 - 1.21 -@Misc{web:diffstat, 1.22 - author = {Thomas Dickey}, 1.23 - title = {\texttt{diffstat}--make a histogram of \texttt{diff} output}, 1.24 - note = {\url{http://dickey.his.com/diffstat/diffstat.html}}, 1.25 -} 1.26 - 1.27 -@Misc{web:quilt, 1.28 - author = {Andreas Gruenbacher, Martin Quinson, Jean Delvare}, 1.29 - title = {Patchwork Quilt}, 1.30 - note = {\url{http://savannah.nongnu.org/projects/quilt}}, 1.31 -} 1.32 - 1.33 -@Misc{web:patchutils, 1.34 - author = {Tim Waugh}, 1.35 - title = {\texttt{patchutils}--programs that operate on patch files}, 1.36 - note = {\url{http://cyberelk.net/tim/patchutils/}}, 1.37 -} 1.38 - 1.39 -@Misc{web:mpatch, 1.40 - author = {Chris Mason}, 1.41 - title = {\texttt{mpatch}--help solve patch rejects}, 1.42 - note = {\url{http://oss.oracle.com/~mason/mpatch/}}, 1.43 -} 1.44 - 1.45 -@Misc{web:wiggle, 1.46 - author = {Neil Brown}, 1.47 - title = {\texttt{wiggle}--apply conflicting patches}, 1.48 - note = {\url{http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/}}, 1.49 -} 1.50 - 1.51 -@Misc{web:mysql-python, 1.52 - author = {Andy Dustman}, 1.53 - title = {MySQL for Python}, 1.54 - note = {\url{http://sourceforge.net/projects/mysql-python}}, 1.55 -} 1.56 - 1.57 -@Misc{web:changelog, 1.58 - author = {Richard Stallman, GNU Project volunteers}, 1.59 - title = {GNU Coding Standards---Change Logs}, 1.60 - note = {\url{http://www.gnu.org/prep/standards/html_node/Change-Logs.html}}, 1.61 -} 1.62 - 1.63 -@Misc{web:macpython, 1.64 - author = {Bob Ippolito, Ronald Oussoren}, 1.65 - title = {Universal MacPython}, 1.66 - note = {\url{http://bob.pythonmac.org/archives/2006/04/10/python-and-universal-binaries-on-mac-os-x/}}, 1.67 -} 1.68 - 1.69 -@Misc{web:putty, 1.70 - author = {Simon Tatham}, 1.71 - title = {PuTTY---open source ssh client for Windows}, 1.72 - note = {\url{http://www.chiark.greenend.org.uk/~sgtatham/putty/}}, 1.73 -} 1.74 - 1.75 -@Misc{web:configparser, 1.76 - author = {Python.org}, 1.77 - title = {\texttt{ConfigParser}---Configuration file parser}, 1.78 - note = {\url{http://docs.python.org/lib/module-ConfigParser.html}}, 1.79 -}
2.1 --- a/en/Makefile Tue Mar 10 21:42:19 2009 -0700 2.2 +++ b/en/Makefile Tue Mar 10 21:58:03 2009 -0700 2.3 @@ -67,6 +67,21 @@ 2.4 tour \ 2.5 tour-merge-conflict 2.6 2.7 +obj-web := html 2.8 +obj-websup := html/support 2.9 + 2.10 +extras-web-base := \ 2.11 + $(obj-web)/index.html \ 2.12 + $(obj-web)/robots.txt \ 2.13 + $(obj-websup)/form-min.js \ 2.14 + $(obj-websup)/form.js \ 2.15 + $(obj-websup)/hsbook.js \ 2.16 + $(obj-websup)/jquery-min.js \ 2.17 + $(obj-websup)/jquery.js \ 2.18 + $(obj-websup)/styles.css 2.19 + 2.20 +extras-web := $(extras-web-base) $(extras-web-base:%=%.gz) 2.21 + 2.22 xsltproc := xsltproc 2.23 xsltproc-opts := --nonet --xinclude --path '$(xml-path)' 2.24 2.25 @@ -109,13 +124,25 @@ 2.26 hg-version = $(shell hg version -q | \ 2.27 sed 's,.*(version \(unknown\|[a-f0-9+]*\)),\1,') 2.28 2.29 -all: html 2.30 +all: web 2.31 2.32 ../xsl/system-xsl: $(system-xsl-dir) 2.33 ln -s $< $@ 2.34 2.35 +web: websup html 2.36 + 2.37 html: ../xsl/system-xsl $(xml-src-files) valid 2.38 - xsltproc $(xsltproc-opts) -o html/x ../xsl/chunk-stylesheet.xsl 00book.xml 2.39 + xsltproc $(xsltproc-opts) -o html/read/x ../xsl/chunk-stylesheet.xsl 00book.xml 2.40 + for i in html/read/*.html; do \ 2.41 + gzip -9 -c $$i > $$i.gz; \ 2.42 + done 2.43 + 2.44 +websup: $(extras-web) 2.45 + mkdir -p $(obj-websup)/figs 2.46 + cp ../xsl/system-xsl/images/*.png $(obj-websup)/figs 2.47 + cp -f ../web/icons/*.png $(obj-websup)/figs 2.48 + 2.49 +web: websup 2.50 2.51 valid: .validated-00book.xml 2.52 2.53 @@ -153,3 +180,29 @@ 2.54 2.55 rsync: install 2.56 rsync -avz --delete dist sp.red-bean.com:public_html/hgbook 2.57 + 2.58 +vpath %.css ../web 2.59 +vpath %.js ../web/javascript 2.60 + 2.61 +$(obj-websup)/%.css: %.css 2.62 + @mkdir -p $(dir $@) 2.63 + cp $< $@ 2.64 + 2.65 +$(obj-websup)/%.jpg: %.jpg 2.66 + @mkdir -p $(dir $@) 2.67 + cp $< $@ 2.68 + 2.69 +$(obj-websup)/%.js: %.js 2.70 + @mkdir -p $(dir $@) 2.71 + cp $< $@ 2.72 + 2.73 +$(obj-web)/%: ../web/% 2.74 + @mkdir -p $(dir $@) 2.75 + cp $< $@ 2.76 + 2.77 +$(obj-web)/%.html: %.html.in 2.78 + @mkdir -p $(dir $@) 2.79 + python ../web/texpand.py $< $@ 2.80 + 2.81 +%.gz: % 2.82 + gzip -9 -c $< > $@
3.1 --- a/en/bookhtml.cfg Tue Mar 10 21:42:19 2009 -0700 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,18 +0,0 @@ 3.4 -% -*- latex -*- 3.5 - 3.6 -\Preamble{xhtml} 3.7 - 3.8 -% Tex4ht's default definition of lists is complete crap. 3.9 -% Unfortunately, it can't distinguish between "ul" and "dl" lists. 3.10 - 3.11 -\ConfigureList{itemize}% 3.12 - {\EndP\HCode{<ul>}\let\endItem=\empty} 3.13 - {\ifvmode \IgnorePar\fi 3.14 - \EndP\HCode{</li></ul>}\ShowPar} 3.15 - {\endItem \def\endItem{\EndP\Tg</span>}\HCode{<li><span class="dt">}} 3.16 - {\HCode{</span><span class="dd">}} 3.17 -\def\textbullet{} 3.18 - 3.19 -\begin{document} 3.20 - 3.21 -\EndPreamble
4.1 --- a/en/feature-branches.dot Tue Mar 10 21:42:19 2009 -0700 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,8 +0,0 @@ 4.4 -digraph feature_branches { 4.5 - master -> crypto; 4.6 - master -> filesystems; 4.7 - master -> ipc; 4.8 - master -> memory; 4.9 - master -> network; 4.10 - master -> security; 4.11 -}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/en/figs/feature-branches.dot Tue Mar 10 21:58:03 2009 -0700 5.3 @@ -0,0 +1,8 @@ 5.4 +digraph feature_branches { 5.5 + master -> crypto; 5.6 + master -> filesystems; 5.7 + master -> ipc; 5.8 + master -> memory; 5.9 + master -> network; 5.10 + master -> security; 5.11 +}
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/en/figs/filelog.svg Tue Mar 10 21:58:03 2009 -0700 6.3 @@ -0,0 +1,373 @@ 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:xlink="http://www.w3.org/1999/xlink" 6.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 6.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 6.15 + width="744.09448819" 6.16 + height="1052.3622047" 6.17 + id="svg2" 6.18 + sodipodi:version="0.32" 6.19 + inkscape:version="0.45.1" 6.20 + sodipodi:docname="filelog.svg" 6.21 + sodipodi:docbase="/home/arun/hgbook/en" 6.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 6.23 + <defs 6.24 + id="defs4"> 6.25 + <marker 6.26 + inkscape:stockid="Arrow1Mend" 6.27 + orient="auto" 6.28 + refY="0.0" 6.29 + refX="0.0" 6.30 + id="Arrow1Mend" 6.31 + style="overflow:visible;"> 6.32 + <path 6.33 + id="path3128" 6.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 " 6.35 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 6.36 + transform="scale(0.4) rotate(180) translate(10,0)" /> 6.37 + </marker> 6.38 + <linearGradient 6.39 + id="linearGradient2887"> 6.40 + <stop 6.41 + style="stop-color:#91cfcf;stop-opacity:1;" 6.42 + offset="0" 6.43 + id="stop2889" /> 6.44 + <stop 6.45 + style="stop-color:aqua;stop-opacity:0;" 6.46 + offset="1" 6.47 + id="stop2891" /> 6.48 + </linearGradient> 6.49 + <linearGradient 6.50 + id="linearGradient2795"> 6.51 + <stop 6.52 + style="stop-color:#ccc;stop-opacity:1;" 6.53 + offset="0" 6.54 + id="stop2797" /> 6.55 + <stop 6.56 + style="stop-color:#ccc;stop-opacity:0;" 6.57 + offset="1" 6.58 + id="stop2799" /> 6.59 + </linearGradient> 6.60 + <linearGradient 6.61 + inkscape:collect="always" 6.62 + xlink:href="#linearGradient2795" 6.63 + id="linearGradient3170" 6.64 + gradientUnits="userSpaceOnUse" 6.65 + gradientTransform="translate(121.2183,94.95434)" 6.66 + x1="81.322357" 6.67 + y1="404.34424" 6.68 + x2="201.52036" 6.69 + y2="373.03967" /> 6.70 + <linearGradient 6.71 + inkscape:collect="always" 6.72 + xlink:href="#linearGradient2887" 6.73 + id="linearGradient3172" 6.74 + gradientUnits="userSpaceOnUse" 6.75 + gradientTransform="translate(0,12)" 6.76 + x1="62.634491" 6.77 + y1="503.3392" 6.78 + x2="248.49242" 6.79 + y2="462.94327" /> 6.80 + <linearGradient 6.81 + inkscape:collect="always" 6.82 + xlink:href="#linearGradient2795" 6.83 + id="linearGradient3174" 6.84 + gradientUnits="userSpaceOnUse" 6.85 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 6.86 + x1="81.322357" 6.87 + y1="404.34424" 6.88 + x2="201.52036" 6.89 + y2="373.03967" /> 6.90 + <linearGradient 6.91 + inkscape:collect="always" 6.92 + xlink:href="#linearGradient2887" 6.93 + id="linearGradient3176" 6.94 + gradientUnits="userSpaceOnUse" 6.95 + gradientTransform="translate(0,12)" 6.96 + x1="62.634491" 6.97 + y1="503.3392" 6.98 + x2="248.49242" 6.99 + y2="462.94327" /> 6.100 + <linearGradient 6.101 + inkscape:collect="always" 6.102 + xlink:href="#linearGradient2795" 6.103 + id="linearGradient3208" 6.104 + gradientUnits="userSpaceOnUse" 6.105 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 6.106 + x1="81.322357" 6.107 + y1="404.34424" 6.108 + x2="201.52036" 6.109 + y2="373.03967" /> 6.110 + <linearGradient 6.111 + inkscape:collect="always" 6.112 + xlink:href="#linearGradient2887" 6.113 + id="linearGradient3210" 6.114 + gradientUnits="userSpaceOnUse" 6.115 + gradientTransform="translate(0,12)" 6.116 + x1="62.634491" 6.117 + y1="503.3392" 6.118 + x2="248.49242" 6.119 + y2="462.94327" /> 6.120 + <linearGradient 6.121 + inkscape:collect="always" 6.122 + xlink:href="#linearGradient2795" 6.123 + id="linearGradient3212" 6.124 + gradientUnits="userSpaceOnUse" 6.125 + gradientTransform="translate(121.2183,94.95434)" 6.126 + x1="81.322357" 6.127 + y1="404.34424" 6.128 + x2="201.52036" 6.129 + y2="373.03967" /> 6.130 + <linearGradient 6.131 + inkscape:collect="always" 6.132 + xlink:href="#linearGradient2887" 6.133 + id="linearGradient3214" 6.134 + gradientUnits="userSpaceOnUse" 6.135 + gradientTransform="translate(0,12)" 6.136 + x1="62.634491" 6.137 + y1="503.3392" 6.138 + x2="248.49242" 6.139 + y2="462.94327" /> 6.140 + <linearGradient 6.141 + inkscape:collect="always" 6.142 + xlink:href="#linearGradient2795" 6.143 + id="linearGradient3256" 6.144 + gradientUnits="userSpaceOnUse" 6.145 + gradientTransform="matrix(1.2343775,0,0,0.9981848,103.25588,95.681888)" 6.146 + x1="74.301666" 6.147 + y1="431.67441" 6.148 + x2="260.05884" 6.149 + y2="369.95322" /> 6.150 + <linearGradient 6.151 + inkscape:collect="always" 6.152 + xlink:href="#linearGradient2887" 6.153 + id="linearGradient3258" 6.154 + gradientUnits="userSpaceOnUse" 6.155 + gradientTransform="matrix(1.228929,0,0,0.9972824,-62.037003,13.312997)" 6.156 + x1="62.634491" 6.157 + y1="503.3392" 6.158 + x2="248.49242" 6.159 + y2="462.94327" /> 6.160 + <linearGradient 6.161 + inkscape:collect="always" 6.162 + xlink:href="#linearGradient2795" 6.163 + id="linearGradient3260" 6.164 + gradientUnits="userSpaceOnUse" 6.165 + gradientTransform="matrix(1.2300738,0,0,0.6517275,219.97511,153.61527)" 6.166 + x1="74.387527" 6.167 + y1="431.80576" 6.168 + x2="259.97339" 6.169 + y2="369.82224" /> 6.170 + <linearGradient 6.171 + inkscape:collect="always" 6.172 + xlink:href="#linearGradient2887" 6.173 + id="linearGradient3262" 6.174 + gradientUnits="userSpaceOnUse" 6.175 + gradientTransform="matrix(1.2289272,0,0,0.9972824,-62.036756,13.312985)" 6.176 + x1="62.634491" 6.177 + y1="503.3392" 6.178 + x2="248.49242" 6.179 + y2="462.94327" /> 6.180 + </defs> 6.181 + <sodipodi:namedview 6.182 + id="base" 6.183 + pagecolor="#ffffff" 6.184 + bordercolor="#666666" 6.185 + borderopacity="1.0" 6.186 + gridtolerance="10000" 6.187 + guidetolerance="10" 6.188 + objecttolerance="10" 6.189 + inkscape:pageopacity="0.0" 6.190 + inkscape:pageshadow="2" 6.191 + inkscape:zoom="1.4" 6.192 + inkscape:cx="455.8122" 6.193 + inkscape:cy="520" 6.194 + inkscape:document-units="px" 6.195 + inkscape:current-layer="layer1" 6.196 + inkscape:window-width="1680" 6.197 + inkscape:window-height="970" 6.198 + inkscape:window-x="0" 6.199 + inkscape:window-y="54" /> 6.200 + <metadata 6.201 + id="metadata7"> 6.202 + <rdf:RDF> 6.203 + <cc:Work 6.204 + rdf:about=""> 6.205 + <dc:format>image/svg+xml</dc:format> 6.206 + <dc:type 6.207 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 6.208 + </cc:Work> 6.209 + </rdf:RDF> 6.210 + </metadata> 6.211 + <g 6.212 + inkscape:label="Layer 1" 6.213 + inkscape:groupmode="layer" 6.214 + id="layer1"> 6.215 + <rect 6.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" 6.217 + id="rect3180" 6.218 + width="273.81375" 6.219 + height="199.06245" 6.220 + x="369.1796" 6.221 + y="351.79019" /> 6.222 + <rect 6.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" 6.224 + id="rect3178" 6.225 + width="273.81339" 6.226 + height="199.06233" 6.227 + x="72.699799" 6.228 + y="351.78983" /> 6.229 + <g 6.230 + id="g3144" 6.231 + transform="translate(80.467048,0.71578)"> 6.232 + <g 6.233 + id="g2940"> 6.234 + <rect 6.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" 6.236 + id="rect2914" 6.237 + width="227.38896" 6.238 + height="39.500999" 6.239 + x="311.92496" 6.240 + y="395.08627" /> 6.241 + <text 6.242 + xml:space="preserve" 6.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" 6.244 + x="323.72824" 6.245 + y="416.7626" 6.246 + id="text2918"><tspan 6.247 + sodipodi:role="line" 6.248 + id="tspan2920" 6.249 + x="323.72824" 6.250 + y="416.7626" 6.251 + style="font-family:Courier">.hg/store/data/README.i</tspan></text> 6.252 + </g> 6.253 + <g 6.254 + transform="translate(3.79093e-5,-80.1853)" 6.255 + id="g2945"> 6.256 + <g 6.257 + id="g2955"> 6.258 + <rect 6.259 + y="475.4968" 6.260 + x="15.550935" 6.261 + height="39.500999" 6.262 + width="227.17694" 6.263 + id="rect2947" 6.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" /> 6.265 + <text 6.266 + id="text2949" 6.267 + y="498.35123" 6.268 + x="31.230644" 6.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" 6.270 + xml:space="preserve"><tspan 6.271 + style="font-family:Courier" 6.272 + y="498.35123" 6.273 + x="31.230644" 6.274 + id="tspan2951" 6.275 + sodipodi:role="line">README</tspan></text> 6.276 + </g> 6.277 + </g> 6.278 + <path 6.279 + inkscape:connector-type="polyline" 6.280 + id="path2960" 6.281 + d="M 242.94685,414.91115 C 242.94685,414.91115 293.61127,415.26754 310.16269,415.38633" 6.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" 6.283 + sodipodi:nodetypes="cz" /> 6.284 + </g> 6.285 + <g 6.286 + id="g3156" 6.287 + transform="translate(80.467048,0.71578)"> 6.288 + <g 6.289 + transform="translate(116,0)" 6.290 + id="g2831"> 6.291 + <rect 6.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" 6.293 + id="rect1906" 6.294 + width="228.18446" 6.295 + height="60.499123" 6.296 + x="195.52719" 6.297 + y="465.51859" /> 6.298 + <g 6.299 + id="g2803" 6.300 + transform="translate(-0.893671,1.833581)"> 6.301 + <text 6.302 + id="text1884" 6.303 + y="483.92801" 6.304 + x="208.95944" 6.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" 6.306 + xml:space="preserve"><tspan 6.307 + style="font-family:Courier" 6.308 + y="483.92801" 6.309 + x="208.95944" 6.310 + id="tspan1886" 6.311 + sodipodi:role="line">.hg/store/data/src/hello.c.d</tspan></text> 6.312 + <text 6.313 + id="text1888" 6.314 + y="507.79309" 6.315 + x="208.95944" 6.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" 6.317 + xml:space="preserve"><tspan 6.318 + style="font-family:Courier" 6.319 + y="507.79309" 6.320 + x="208.95944" 6.321 + id="tspan1890" 6.322 + sodipodi:role="line">.hg/store/data/src/hello.c.i</tspan></text> 6.323 + </g> 6.324 + </g> 6.325 + <g 6.326 + id="g2907"> 6.327 + <rect 6.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" 6.329 + id="rect2843" 6.330 + width="227.17728" 6.331 + height="39.500999" 6.332 + x="15.550805" 6.333 + y="475.4968" /> 6.334 + <text 6.335 + xml:space="preserve" 6.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" 6.337 + x="31.230644" 6.338 + y="498.35123" 6.339 + id="text2847"><tspan 6.340 + sodipodi:role="line" 6.341 + id="tspan2849" 6.342 + x="31.230644" 6.343 + y="498.35123" 6.344 + style="font-family:Courier">src/hello.c</tspan></text> 6.345 + </g> 6.346 + <path 6.347 + inkscape:connection-end="#g2831" 6.348 + inkscape:connection-start="#g2907" 6.349 + inkscape:connector-type="polyline" 6.350 + id="path2962" 6.351 + d="M 242.4315,495.88043 C 242.4315,495.88043 292.8861,495.99942 310.04102,496.03909" 6.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" 6.353 + sodipodi:nodetypes="cs" /> 6.354 + </g> 6.355 + <text 6.356 + xml:space="preserve" 6.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" 6.358 + x="98.496666" 6.359 + y="373.96353" 6.360 + id="text3216"><tspan 6.361 + sodipodi:role="line" 6.362 + id="tspan3218" 6.363 + x="98.496666" 6.364 + y="373.96353">Working directory</tspan></text> 6.365 + <text 6.366 + xml:space="preserve" 6.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" 6.368 + x="391.39197" 6.369 + y="373.96353" 6.370 + id="text3228"><tspan 6.371 + sodipodi:role="line" 6.372 + id="tspan3230" 6.373 + x="391.39197" 6.374 + y="373.96353">Repository</tspan></text> 6.375 + </g> 6.376 +</svg>
7.1 Binary file en/figs/kdiff3.png has changed
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/en/figs/metadata.svg Tue Mar 10 21:58:03 2009 -0700 8.3 @@ -0,0 +1,328 @@ 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 8.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 8.14 + width="744.09448819" 8.15 + height="1052.3622047" 8.16 + id="svg2" 8.17 + sodipodi:version="0.32" 8.18 + inkscape:version="0.44.1" 8.19 + sodipodi:docname="metadata.svg" 8.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 8.21 + <defs 8.22 + id="defs4"> 8.23 + <marker 8.24 + inkscape:stockid="Arrow1Mend" 8.25 + orient="auto" 8.26 + refY="0.0" 8.27 + refX="0.0" 8.28 + id="Arrow1Mend" 8.29 + style="overflow:visible;"> 8.30 + <path 8.31 + id="path2944" 8.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 " 8.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 8.34 + transform="scale(0.4) rotate(180) translate(10,0)" /> 8.35 + </marker> 8.36 + </defs> 8.37 + <sodipodi:namedview 8.38 + id="base" 8.39 + pagecolor="#ffffff" 8.40 + bordercolor="#666666" 8.41 + borderopacity="1.0" 8.42 + gridtolerance="10000" 8.43 + guidetolerance="10" 8.44 + objecttolerance="10" 8.45 + inkscape:pageopacity="0.0" 8.46 + inkscape:pageshadow="2" 8.47 + inkscape:zoom="1.4" 8.48 + inkscape:cx="232.14286" 8.49 + inkscape:cy="490.68696" 8.50 + inkscape:document-units="px" 8.51 + inkscape:current-layer="layer1" 8.52 + inkscape:window-width="906" 8.53 + inkscape:window-height="620" 8.54 + inkscape:window-x="181" 8.55 + inkscape:window-y="58" /> 8.56 + <metadata 8.57 + id="metadata7"> 8.58 + <rdf:RDF> 8.59 + <cc:Work 8.60 + rdf:about=""> 8.61 + <dc:format>image/svg+xml</dc:format> 8.62 + <dc:type 8.63 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 8.64 + </cc:Work> 8.65 + </rdf:RDF> 8.66 + </metadata> 8.67 + <g 8.68 + inkscape:label="Layer 1" 8.69 + inkscape:groupmode="layer" 8.70 + id="layer1"> 8.71 + <path 8.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" 8.73 + d="M 326.94646,467.18359 L 326.94646,510.98123" 8.74 + id="path1910" 8.75 + inkscape:connector-type="polyline" 8.76 + inkscape:connection-end="#rect2962" 8.77 + inkscape:connection-start="#rect2764" /> 8.78 + <path 8.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" 8.80 + d="M 326.94646,531.98123 L 326.94646,591.77887" 8.81 + id="path1912" 8.82 + inkscape:connector-type="polyline" 8.83 + inkscape:connection-start="#rect2962" 8.84 + inkscape:connection-end="#rect3000" /> 8.85 + <path 8.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" 8.87 + d="M 316.1622,531.98123 L 192.30212,652.57648" 8.88 + id="path1916" 8.89 + inkscape:connector-type="polyline" 8.90 + inkscape:connection-end="#rect3038" 8.91 + inkscape:connection-start="#rect2962" /> 8.92 + <path 8.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" 8.94 + d="M 254.23217,467.18359 L 254.23216,510.98123" 8.95 + id="path3088" 8.96 + inkscape:connector-type="polyline" 8.97 + inkscape:connection-start="#rect1872" 8.98 + inkscape:connection-end="#rect2960" /> 8.99 + <path 8.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" 8.101 + d="M 254.23215,531.98123 L 254.23215,591.77887" 8.102 + id="path3090" 8.103 + inkscape:connector-type="polyline" 8.104 + inkscape:connection-start="#rect2960" 8.105 + inkscape:connection-end="#rect2998" /> 8.106 + <path 8.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" 8.108 + d="M 248.84002,531.98123 L 186.90999,652.57648" 8.109 + id="path3092" 8.110 + inkscape:connector-type="polyline" 8.111 + inkscape:connection-start="#rect2960" 8.112 + inkscape:connection-end="#rect3038" /> 8.113 + <rect 8.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" 8.115 + id="rect1872" 8.116 + width="51.42857" 8.117 + height="20" 8.118 + x="228.51788" 8.119 + y="446.68359" /> 8.120 + <rect 8.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" 8.122 + id="rect2764" 8.123 + width="51.42857" 8.124 + height="20" 8.125 + x="301.23218" 8.126 + y="446.68359" /> 8.127 + <rect 8.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" 8.129 + id="rect2766" 8.130 + width="51.42857" 8.131 + height="20" 8.132 + x="155.80359" 8.133 + y="446.68359" /> 8.134 + <rect 8.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" 8.136 + id="rect2768" 8.137 + width="51.42857" 8.138 + height="20" 8.139 + x="83.089294" 8.140 + y="446.68359" /> 8.141 + <path 8.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" 8.143 + d="M 135.01786,456.68359 L 155.30359,456.68359" 8.144 + id="path2770" 8.145 + inkscape:connector-type="polyline" 8.146 + inkscape:connection-start="#rect2768" 8.147 + inkscape:connection-end="#rect2766" /> 8.148 + <path 8.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" 8.150 + d="M 207.73216,456.68359 L 228.01788,456.68359" 8.151 + id="path2772" 8.152 + inkscape:connector-type="polyline" 8.153 + inkscape:connection-start="#rect2766" 8.154 + inkscape:connection-end="#rect1872" /> 8.155 + <path 8.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" 8.157 + d="M 280.44645,456.68359 L 300.73218,456.68359" 8.158 + id="path2774" 8.159 + inkscape:connector-type="polyline" 8.160 + inkscape:connection-start="#rect1872" 8.161 + inkscape:connection-end="#rect2764" /> 8.162 + <path 8.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" 8.164 + d="M 62.303571,456.68359 L 82.589294,456.68359" 8.165 + id="path2778" 8.166 + inkscape:connector-type="polyline" 8.167 + inkscape:connection-end="#rect2768" /> 8.168 + <rect 8.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" 8.170 + id="rect2960" 8.171 + width="51.42857" 8.172 + height="20" 8.173 + x="228.51787" 8.174 + y="511.48123" /> 8.175 + <rect 8.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" 8.177 + id="rect2962" 8.178 + width="51.42857" 8.179 + height="20" 8.180 + x="301.23218" 8.181 + y="511.48123" /> 8.182 + <rect 8.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" 8.184 + id="rect2964" 8.185 + width="51.42857" 8.186 + height="20" 8.187 + x="155.80357" 8.188 + y="511.48123" /> 8.189 + <rect 8.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" 8.191 + id="rect2966" 8.192 + width="51.42857" 8.193 + height="20" 8.194 + x="83.089287" 8.195 + y="511.48123" /> 8.196 + <path 8.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" 8.198 + d="M 135.01786,521.48121 L 155.30359,521.48121" 8.199 + id="path2968" 8.200 + inkscape:connector-type="polyline" /> 8.201 + <path 8.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" 8.203 + d="M 207.73216,521.48121 L 228.01788,521.48121" 8.204 + id="path2970" 8.205 + inkscape:connector-type="polyline" /> 8.206 + <path 8.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" 8.208 + d="M 280.44645,521.48121 L 300.73218,521.48121" 8.209 + id="path2972" 8.210 + inkscape:connector-type="polyline" /> 8.211 + <path 8.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" 8.213 + d="M 62.30358,521.48121 L 82.5893,521.48121" 8.214 + id="path2974" 8.215 + inkscape:connector-type="polyline" /> 8.216 + <rect 8.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" 8.218 + id="rect2998" 8.219 + width="51.42857" 8.220 + height="20" 8.221 + x="228.51787" 8.222 + y="592.27887" /> 8.223 + <rect 8.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" 8.225 + id="rect3000" 8.226 + width="51.42857" 8.227 + height="20" 8.228 + x="301.23218" 8.229 + y="592.27887" /> 8.230 + <rect 8.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" 8.232 + id="rect3002" 8.233 + width="51.42857" 8.234 + height="20" 8.235 + x="155.80357" 8.236 + y="592.27887" /> 8.237 + <rect 8.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" 8.239 + id="rect3004" 8.240 + width="51.42857" 8.241 + height="20" 8.242 + x="83.089287" 8.243 + y="592.27887" /> 8.244 + <path 8.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" 8.246 + d="M 135.01786,602.27884 L 155.30359,602.27884" 8.247 + id="path3006" 8.248 + inkscape:connector-type="polyline" /> 8.249 + <path 8.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" 8.251 + d="M 207.73216,602.27884 L 228.01788,602.27884" 8.252 + id="path3008" 8.253 + inkscape:connector-type="polyline" /> 8.254 + <path 8.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" 8.256 + d="M 280.44645,602.27884 L 300.73218,602.27884" 8.257 + id="path3010" 8.258 + inkscape:connector-type="polyline" /> 8.259 + <path 8.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" 8.261 + d="M 62.30358,602.27884 L 82.5893,602.27884" 8.262 + id="path3012" 8.263 + inkscape:connector-type="polyline" /> 8.264 + <rect 8.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" 8.266 + id="rect3034" 8.267 + width="51.42857" 8.268 + height="20" 8.269 + x="228.51787" 8.270 + y="653.07648" /> 8.271 + <rect 8.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" 8.273 + id="rect3038" 8.274 + width="51.42857" 8.275 + height="20" 8.276 + x="155.80357" 8.277 + y="653.07648" /> 8.278 + <rect 8.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" 8.280 + id="rect3040" 8.281 + width="51.42857" 8.282 + height="20" 8.283 + x="83.089287" 8.284 + y="653.07648" /> 8.285 + <path 8.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" 8.287 + d="M 135.01786,663.07646 L 155.30359,663.07646" 8.288 + id="path3042" 8.289 + inkscape:connector-type="polyline" /> 8.290 + <path 8.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" 8.292 + d="M 207.73216,663.07646 L 228.01788,663.07646" 8.293 + id="path3044" 8.294 + inkscape:connector-type="polyline" /> 8.295 + <path 8.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" 8.297 + d="M 62.30358,663.07646 L 82.5893,663.07646" 8.298 + id="path3048" 8.299 + inkscape:connector-type="polyline" /> 8.300 + <text 8.301 + xml:space="preserve" 8.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" 8.303 + x="82.072548" 8.304 + y="432.64789" 8.305 + id="text3094"><tspan 8.306 + sodipodi:role="line" 8.307 + id="tspan3096" 8.308 + x="82.072548" 8.309 + y="432.64789">Changelog</tspan></text> 8.310 + <text 8.311 + xml:space="preserve" 8.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" 8.313 + x="82.306923" 8.314 + y="498.97327" 8.315 + id="text3098"><tspan 8.316 + sodipodi:role="line" 8.317 + id="tspan3100" 8.318 + x="82.306923" 8.319 + y="498.97327">Manifest</tspan></text> 8.320 + <text 8.321 + xml:space="preserve" 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 + x="82.14286" 8.324 + y="580.08569" 8.325 + id="text3102"><tspan 8.326 + sodipodi:role="line" 8.327 + id="tspan3104" 8.328 + x="82.14286" 8.329 + y="580.08569">Filelogs</tspan></text> 8.330 + </g> 8.331 +</svg>
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/en/figs/mq-stack.svg Tue Mar 10 21:58:03 2009 -0700 9.3 @@ -0,0 +1,270 @@ 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://inkscape.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="svg2" 9.17 + sodipodi:version="0.32" 9.18 + inkscape:version="0.43" 9.19 + sodipodi:docname="mq-stack.svg" 9.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 9.21 + <defs 9.22 + id="defs4" /> 9.23 + <sodipodi:namedview 9.24 + id="base" 9.25 + pagecolor="#ffffff" 9.26 + bordercolor="#666666" 9.27 + borderopacity="1.0" 9.28 + inkscape:pageopacity="0.0" 9.29 + inkscape:pageshadow="2" 9.30 + inkscape:zoom="1.4142136" 9.31 + inkscape:cx="299.33323" 9.32 + inkscape:cy="815.646" 9.33 + inkscape:document-units="px" 9.34 + inkscape:current-layer="layer1" 9.35 + inkscape:window-width="1014" 9.36 + inkscape:window-height="689" 9.37 + inkscape:window-x="0" 9.38 + inkscape:window-y="25" /> 9.39 + <metadata 9.40 + id="metadata7"> 9.41 + <rdf:RDF> 9.42 + <cc:Work 9.43 + rdf:about=""> 9.44 + <dc:format>image/svg+xml</dc:format> 9.45 + <dc:type 9.46 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 9.47 + </cc:Work> 9.48 + </rdf:RDF> 9.49 + </metadata> 9.50 + <g 9.51 + inkscape:label="Layer 1" 9.52 + inkscape:groupmode="layer" 9.53 + id="layer1"> 9.54 + <rect 9.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" 9.56 + id="rect1307" 9.57 + width="202.93683" 9.58 + height="24.243662" 9.59 + x="230.01944" 9.60 + y="221.70146" /> 9.61 + <text 9.62 + xml:space="preserve" 9.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" 9.64 + x="237.89606" 9.65 + y="237.13383" 9.66 + id="text1309"><tspan 9.67 + sodipodi:role="line" 9.68 + id="tspan1311" 9.69 + x="237.89606" 9.70 + y="237.13383">prevent-compiler-reorder.patch</tspan></text> 9.71 + <rect 9.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" 9.73 + id="rect1320" 9.74 + width="202.93683" 9.75 + height="24.243662" 9.76 + x="230.01936" 9.77 + y="251.34325" /> 9.78 + <text 9.79 + xml:space="preserve" 9.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" 9.81 + x="237.89598" 9.82 + y="266.77563" 9.83 + id="text1322"><tspan 9.84 + sodipodi:role="line" 9.85 + id="tspan1324" 9.86 + x="237.89598" 9.87 + y="266.77563">namespace-cleanup.patch</tspan></text> 9.88 + <rect 9.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" 9.90 + id="rect2217" 9.91 + width="202.93683" 9.92 + height="24.243662" 9.93 + x="230.01936" 9.94 + y="280.98505" /> 9.95 + <text 9.96 + xml:space="preserve" 9.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" 9.98 + x="237.89598" 9.99 + y="296.41742" 9.100 + id="text2219"><tspan 9.101 + sodipodi:role="line" 9.102 + id="tspan2221" 9.103 + x="237.89598" 9.104 + y="296.41742">powerpc-port-fixes.patch</tspan></text> 9.105 + <rect 9.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" 9.107 + id="rect3114" 9.108 + width="202.93683" 9.109 + height="24.243662" 9.110 + x="230.01936" 9.111 + y="310.6268" /> 9.112 + <text 9.113 + xml:space="preserve" 9.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" 9.115 + x="237.89598" 9.116 + y="326.05917" 9.117 + id="text3116"><tspan 9.118 + sodipodi:role="line" 9.119 + id="tspan3118" 9.120 + x="237.89598" 9.121 + y="326.05917">report-devinfo-correctly.patch</tspan></text> 9.122 + <text 9.123 + xml:space="preserve" 9.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" 9.125 + x="200.01021" 9.126 + y="191.68094" 9.127 + id="text3170" 9.128 + sodipodi:linespacing="125%"><tspan 9.129 + sodipodi:role="line" 9.130 + id="tspan3172" 9.131 + x="200.01021" 9.132 + y="191.68094" 9.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> 9.134 + <text 9.135 + xml:space="preserve" 9.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" 9.137 + x="255.26627" 9.138 + y="248.79449" 9.139 + id="text3190" 9.140 + sodipodi:linespacing="125%" 9.141 + transform="scale(0.786716,1.271107)"><tspan 9.142 + sodipodi:role="line" 9.143 + id="tspan3192" 9.144 + x="255.26627" 9.145 + y="248.79449" 9.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> 9.147 + <text 9.148 + xml:space="preserve" 9.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" 9.150 + x="195.86807" 9.151 + y="173.17117" 9.152 + id="text4085" 9.153 + sodipodi:linespacing="125%"><tspan 9.154 + sodipodi:role="line" 9.155 + id="tspan4087" 9.156 + x="195.86807" 9.157 + y="173.17117" 9.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 9.159 + sodipodi:role="line" 9.160 + x="195.86807" 9.161 + y="188.17117" 9.162 + id="tspan4089" 9.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> 9.164 + <text 9.165 + xml:space="preserve" 9.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" 9.167 + x="195.0712" 9.168 + y="288.91745" 9.169 + id="text4091" 9.170 + sodipodi:linespacing="125%"><tspan 9.171 + sodipodi:role="line" 9.172 + id="tspan4093" 9.173 + x="195.0712" 9.174 + y="288.91745" 9.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 9.176 + sodipodi:role="line" 9.177 + x="195.0712" 9.178 + y="303.91745" 9.179 + id="tspan4111" 9.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> 9.181 + <text 9.182 + xml:space="preserve" 9.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" 9.184 + x="195.0712" 9.185 + y="229.28813" 9.186 + id="text4095" 9.187 + sodipodi:linespacing="125%"><tspan 9.188 + sodipodi:role="line" 9.189 + id="tspan4097" 9.190 + x="195.0712" 9.191 + y="229.28813" 9.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 9.193 + sodipodi:role="line" 9.194 + x="195.0712" 9.195 + y="244.28813" 9.196 + id="tspan4109" 9.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> 9.198 + <text 9.199 + xml:space="preserve" 9.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" 9.201 + x="450.4975" 9.202 + y="238.29692" 9.203 + id="text4137"><tspan 9.204 + sodipodi:role="line" 9.205 + id="tspan4139" 9.206 + x="450.4975" 9.207 + y="238.29692">201ad3209902</tspan></text> 9.208 + <text 9.209 + xml:space="preserve" 9.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" 9.211 + x="450.05804" 9.212 + y="267.93872" 9.213 + id="text4141"><tspan 9.214 + sodipodi:role="line" 9.215 + id="tspan4143" 9.216 + x="450.05804" 9.217 + y="267.93872">126b84e593ae</tspan></text> 9.218 + <text 9.219 + xml:space="preserve" 9.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" 9.221 + x="450.6557" 9.222 + y="297.58051" 9.223 + id="text4145"><tspan 9.224 + sodipodi:role="line" 9.225 + id="tspan4147" 9.226 + x="450.6557" 9.227 + y="297.58051">a655daf15409</tspan></text> 9.228 + <text 9.229 + xml:space="preserve" 9.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" 9.231 + x="450.71429" 9.232 + y="327.22226" 9.233 + id="text4149"><tspan 9.234 + sodipodi:role="line" 9.235 + id="tspan4151" 9.236 + x="450.71429" 9.237 + y="327.22226">e50d59aaea3a</tspan></text> 9.238 + <rect 9.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" 9.240 + id="rect3106" 9.241 + width="202.93683" 9.242 + height="24.243662" 9.243 + x="230.01936" 9.244 + y="150.41792" /> 9.245 + <text 9.246 + xml:space="preserve" 9.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" 9.248 + x="237.89598" 9.249 + y="165.8503" 9.250 + id="text3108"><tspan 9.251 + sodipodi:role="line" 9.252 + id="tspan3110" 9.253 + x="237.89598" 9.254 + y="165.8503">forbid-illegal-params.patch</tspan></text> 9.255 + <rect 9.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" 9.257 + id="rect2241" 9.258 + width="202.93683" 9.259 + height="24.243662" 9.260 + x="230.16466" 9.261 + y="180.05968" /> 9.262 + <text 9.263 + xml:space="preserve" 9.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" 9.265 + x="238.04128" 9.266 + y="195.49205" 9.267 + id="text2243"><tspan 9.268 + sodipodi:role="line" 9.269 + id="tspan2245" 9.270 + x="238.04128" 9.271 + y="195.49205">fix-memory-leak.patch</tspan></text> 9.272 + </g> 9.273 +</svg>
10.1 Binary file en/figs/note.png has changed
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/en/figs/revlog.svg Tue Mar 10 21:58:03 2009 -0700 11.3 @@ -0,0 +1,1155 @@ 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:xlink="http://www.w3.org/1999/xlink" 11.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 11.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 11.15 + width="744.09448819" 11.16 + height="1052.3622047" 11.17 + id="svg2" 11.18 + sodipodi:version="0.32" 11.19 + inkscape:version="0.44.1" 11.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 11.21 + sodipodi:docname="revlog.svg"> 11.22 + <defs 11.23 + id="defs4"> 11.24 + <marker 11.25 + inkscape:stockid="Arrow1Mend" 11.26 + orient="auto" 11.27 + refY="0.0" 11.28 + refX="0.0" 11.29 + id="Arrow1Mend" 11.30 + style="overflow:visible;"> 11.31 + <path 11.32 + id="path4852" 11.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 " 11.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 11.35 + transform="scale(0.4) rotate(180) translate(10,0)" /> 11.36 + </marker> 11.37 + <linearGradient 11.38 + id="linearGradient3092"> 11.39 + <stop 11.40 + style="stop-color:#44436f;stop-opacity:1;" 11.41 + offset="0" 11.42 + id="stop3094" /> 11.43 + <stop 11.44 + style="stop-color:#abade5;stop-opacity:1;" 11.45 + offset="1" 11.46 + id="stop3096" /> 11.47 + </linearGradient> 11.48 + <linearGradient 11.49 + inkscape:collect="always" 11.50 + xlink:href="#linearGradient3092" 11.51 + id="linearGradient3118" 11.52 + gradientUnits="userSpaceOnUse" 11.53 + x1="176.16635" 11.54 + y1="405.21934" 11.55 + x2="417.11935" 11.56 + y2="405.21934" /> 11.57 + <linearGradient 11.58 + inkscape:collect="always" 11.59 + xlink:href="#linearGradient3092" 11.60 + id="linearGradient3120" 11.61 + gradientUnits="userSpaceOnUse" 11.62 + x1="176.16635" 11.63 + y1="405.21934" 11.64 + x2="417.11935" 11.65 + y2="405.21934" /> 11.66 + <linearGradient 11.67 + inkscape:collect="always" 11.68 + xlink:href="#linearGradient3092" 11.69 + id="linearGradient3129" 11.70 + gradientUnits="userSpaceOnUse" 11.71 + x1="176.16635" 11.72 + y1="405.21934" 11.73 + x2="417.11935" 11.74 + y2="405.21934" 11.75 + gradientTransform="translate(-0.928574,-1.428574)" /> 11.76 + <linearGradient 11.77 + inkscape:collect="always" 11.78 + xlink:href="#linearGradient3092" 11.79 + id="linearGradient3133" 11.80 + gradientUnits="userSpaceOnUse" 11.81 + x1="176.16635" 11.82 + y1="405.21934" 11.83 + x2="417.11935" 11.84 + y2="405.21934" 11.85 + gradientTransform="translate(-0.928574,-1.428574)" /> 11.86 + <linearGradient 11.87 + inkscape:collect="always" 11.88 + xlink:href="#linearGradient3092" 11.89 + id="linearGradient3708" 11.90 + gradientUnits="userSpaceOnUse" 11.91 + gradientTransform="matrix(0.423343,0,0,0.423343,138.874,-67.01732)" 11.92 + x1="175.23776" 11.93 + y1="509.98154" 11.94 + x2="416.29077" 11.95 + y2="297.49997" /> 11.96 + <linearGradient 11.97 + inkscape:collect="always" 11.98 + xlink:href="#linearGradient3092" 11.99 + id="linearGradient5164" 11.100 + gradientUnits="userSpaceOnUse" 11.101 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,247.4358)" 11.102 + x1="175.23776" 11.103 + y1="509.98154" 11.104 + x2="416.29077" 11.105 + y2="297.49997" /> 11.106 + <linearGradient 11.107 + inkscape:collect="always" 11.108 + xlink:href="#linearGradient3092" 11.109 + id="linearGradient5584" 11.110 + gradientUnits="userSpaceOnUse" 11.111 + gradientTransform="matrix(0.423343,0,0,0.423343,143.9081,371.2915)" 11.112 + x1="175.23776" 11.113 + y1="509.98154" 11.114 + x2="416.29077" 11.115 + y2="297.49997" /> 11.116 + <linearGradient 11.117 + inkscape:collect="always" 11.118 + xlink:href="#linearGradient3092" 11.119 + id="linearGradient5784" 11.120 + gradientUnits="userSpaceOnUse" 11.121 + gradientTransform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 11.122 + x1="175.23776" 11.123 + y1="509.98154" 11.124 + x2="416.29077" 11.125 + y2="297.49997" /> 11.126 + <linearGradient 11.127 + inkscape:collect="always" 11.128 + xlink:href="#linearGradient3092" 11.129 + id="linearGradient5786" 11.130 + gradientUnits="userSpaceOnUse" 11.131 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,152.137)" 11.132 + x1="175.23776" 11.133 + y1="509.98154" 11.134 + x2="416.29077" 11.135 + y2="297.49997" /> 11.136 + <linearGradient 11.137 + inkscape:collect="always" 11.138 + xlink:href="#linearGradient3092" 11.139 + id="linearGradient5895" 11.140 + gradientUnits="userSpaceOnUse" 11.141 + gradientTransform="matrix(0.423343,0,0,0.423343,198.0215,261.7142)" 11.142 + x1="175.23776" 11.143 + y1="509.98154" 11.144 + x2="416.29077" 11.145 + y2="297.49997" /> 11.146 + <linearGradient 11.147 + inkscape:collect="always" 11.148 + xlink:href="#linearGradient3092" 11.149 + id="linearGradient5958" 11.150 + gradientUnits="userSpaceOnUse" 11.151 + gradientTransform="matrix(0.423343,0,0,0.423343,137.1978,42.55987)" 11.152 + x1="175.23776" 11.153 + y1="509.98154" 11.154 + x2="416.29077" 11.155 + y2="297.49997" /> 11.156 + </defs> 11.157 + <sodipodi:namedview 11.158 + id="base" 11.159 + pagecolor="#ffffff" 11.160 + bordercolor="#666666" 11.161 + borderopacity="1.0" 11.162 + gridtolerance="10000" 11.163 + guidetolerance="10" 11.164 + objecttolerance="10" 11.165 + inkscape:pageopacity="0.0" 11.166 + inkscape:pageshadow="2" 11.167 + inkscape:zoom="0.64" 11.168 + inkscape:cx="566.02368" 11.169 + inkscape:cy="688.16826" 11.170 + inkscape:document-units="px" 11.171 + inkscape:current-layer="layer1" 11.172 + inkscape:window-width="906" 11.173 + inkscape:window-height="620" 11.174 + inkscape:window-x="29" 11.175 + inkscape:window-y="79" 11.176 + inkscape:connector-spacing="11" /> 11.177 + <metadata 11.178 + id="metadata7"> 11.179 + <rdf:RDF> 11.180 + <cc:Work 11.181 + rdf:about=""> 11.182 + <dc:format>image/svg+xml</dc:format> 11.183 + <dc:type 11.184 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 11.185 + </cc:Work> 11.186 + </rdf:RDF> 11.187 + </metadata> 11.188 + <g 11.189 + inkscape:label="Layer 1" 11.190 + inkscape:groupmode="layer" 11.191 + id="layer1"> 11.192 + <rect 11.193 + y="168.74846" 11.194 + x="211.58516" 11.195 + height="89.506805" 11.196 + width="101.60232" 11.197 + id="rect3068" 11.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" /> 11.199 + <g 11.200 + id="g3215" 11.201 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55985)"> 11.202 + <rect 11.203 + y="447.71451" 11.204 + x="299.67859" 11.205 + height="48.571426" 11.206 + width="103.14286" 11.207 + id="rect2899" 11.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" /> 11.209 + <text 11.210 + id="text2903" 11.211 + y="464.8139" 11.212 + x="308.89639" 11.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" 11.214 + xml:space="preserve"><tspan 11.215 + y="464.8139" 11.216 + x="308.89639" 11.217 + sodipodi:role="line" 11.218 + id="tspan2905">Second parent</tspan></text> 11.219 + <text 11.220 + id="text2907" 11.221 + y="485.50256" 11.222 + x="308.20175" 11.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" 11.224 + xml:space="preserve"><tspan 11.225 + style="font-family:Courier" 11.226 + y="485.50256" 11.227 + x="308.20175" 11.228 + id="tspan2909" 11.229 + sodipodi:role="line">32bf9a5f22c0</tspan></text> 11.230 + </g> 11.231 + <g 11.232 + id="g3250" 11.233 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55986)"> 11.234 + <rect 11.235 + y="311.28598" 11.236 + x="188.6071" 11.237 + height="48.571426" 11.238 + width="103.14286" 11.239 + id="rect2936" 11.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" /> 11.241 + <text 11.242 + id="text2940" 11.243 + y="328.38538" 11.244 + x="197.82495" 11.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" 11.246 + xml:space="preserve"><tspan 11.247 + y="328.38538" 11.248 + x="197.82495" 11.249 + sodipodi:role="line" 11.250 + id="tspan2942">Revision hash</tspan></text> 11.251 + <text 11.252 + id="text2944" 11.253 + y="349.07404" 11.254 + x="197.13031" 11.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" 11.256 + xml:space="preserve"><tspan 11.257 + style="font-family:Courier" 11.258 + y="349.07404" 11.259 + x="197.13031" 11.260 + id="tspan2946" 11.261 + sodipodi:role="line">34b8b7a15ea1</tspan></text> 11.262 + </g> 11.263 + <g 11.264 + id="g3243" 11.265 + transform="matrix(0.423343,0,0,0.423343,137.6664,43.91853)"> 11.266 + <rect 11.267 + y="363.07654" 11.268 + x="187.5" 11.269 + height="75" 11.270 + width="213.85715" 11.271 + id="rect2950" 11.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" /> 11.273 + <text 11.274 + id="text2958" 11.275 + y="400.86459" 11.276 + x="196.02321" 11.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" 11.278 + xml:space="preserve"><tspan 11.279 + style="fill:black;fill-opacity:1;font-family:Courier" 11.280 + y="400.86459" 11.281 + x="196.02321" 11.282 + id="tspan2960" 11.283 + sodipodi:role="line">...</tspan></text> 11.284 + <text 11.285 + id="text2954" 11.286 + y="380.17593" 11.287 + x="196.71785" 11.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" 11.289 + xml:space="preserve"><tspan 11.290 + y="380.17593" 11.291 + x="196.71785" 11.292 + sodipodi:role="line" 11.293 + id="tspan2956" 11.294 + style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 11.295 + </g> 11.296 + <g 11.297 + id="g5529" 11.298 + transform="translate(-6.710312,-8.165836e-6)"> 11.299 + <rect 11.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" 11.301 + id="rect3509" 11.302 + width="101.60232" 11.303 + height="89.506805" 11.304 + x="218.29547" 11.305 + y="497.4801" /> 11.306 + <g 11.307 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 11.308 + id="g3513"> 11.309 + <g 11.310 + id="g3515"> 11.311 + <rect 11.312 + y="447.72418" 11.313 + x="188.6071" 11.314 + height="48.571426" 11.315 + width="103.14286" 11.316 + id="rect3517" 11.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" /> 11.318 + <text 11.319 + id="text3519" 11.320 + y="464.82358" 11.321 + x="197.82495" 11.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" 11.323 + xml:space="preserve"><tspan 11.324 + y="464.82358" 11.325 + x="197.82495" 11.326 + sodipodi:role="line" 11.327 + id="tspan3521">First parent</tspan></text> 11.328 + <text 11.329 + id="text3523" 11.330 + y="485.51224" 11.331 + x="197.13031" 11.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" 11.333 + xml:space="preserve"><tspan 11.334 + style="font-family:Courier" 11.335 + y="485.51224" 11.336 + x="197.13031" 11.337 + id="tspan3525" 11.338 + sodipodi:role="line">000000000000</tspan></text> 11.339 + </g> 11.340 + <g 11.341 + id="g3527"> 11.342 + <rect 11.343 + y="447.71451" 11.344 + x="299.67859" 11.345 + height="48.571426" 11.346 + width="103.14286" 11.347 + id="rect3529" 11.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" /> 11.349 + <text 11.350 + id="text3531" 11.351 + y="464.8139" 11.352 + x="308.89639" 11.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" 11.354 + xml:space="preserve"><tspan 11.355 + y="464.8139" 11.356 + x="308.89639" 11.357 + sodipodi:role="line" 11.358 + id="tspan3533">Second parent</tspan></text> 11.359 + <text 11.360 + id="text3535" 11.361 + y="485.50256" 11.362 + x="308.20175" 11.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" 11.364 + xml:space="preserve"><tspan 11.365 + style="font-family:Courier" 11.366 + y="485.50256" 11.367 + x="308.20175" 11.368 + id="tspan3537" 11.369 + sodipodi:role="line">000000000000</tspan></text> 11.370 + </g> 11.371 + </g> 11.372 + <g 11.373 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 11.374 + id="g3539"> 11.375 + <rect 11.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" 11.377 + id="rect3541" 11.378 + width="103.14286" 11.379 + height="48.571426" 11.380 + x="188.6071" 11.381 + y="311.28598" /> 11.382 + <text 11.383 + xml:space="preserve" 11.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" 11.385 + x="197.82495" 11.386 + y="328.38538" 11.387 + id="text3543"><tspan 11.388 + id="tspan3545" 11.389 + sodipodi:role="line" 11.390 + x="197.82495" 11.391 + y="328.38538">Revision hash</tspan></text> 11.392 + <text 11.393 + xml:space="preserve" 11.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" 11.395 + x="197.13031" 11.396 + y="349.07404" 11.397 + id="text3547"><tspan 11.398 + sodipodi:role="line" 11.399 + id="tspan3549" 11.400 + x="197.13031" 11.401 + y="349.07404" 11.402 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 11.403 + </g> 11.404 + <g 11.405 + transform="matrix(0.423343,0,0,0.423343,144.3767,372.6502)" 11.406 + id="g3551"> 11.407 + <rect 11.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" 11.409 + id="rect3553" 11.410 + width="213.85715" 11.411 + height="75" 11.412 + x="187.5" 11.413 + y="363.07654" /> 11.414 + <text 11.415 + xml:space="preserve" 11.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" 11.417 + x="196.02321" 11.418 + y="400.86459" 11.419 + id="text3555"><tspan 11.420 + sodipodi:role="line" 11.421 + id="tspan3557" 11.422 + x="196.02321" 11.423 + y="400.86459" 11.424 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 11.425 + <text 11.426 + xml:space="preserve" 11.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" 11.428 + x="196.71785" 11.429 + y="380.17593" 11.430 + id="text3559"><tspan 11.431 + style="fill:black;fill-opacity:1" 11.432 + id="tspan3561" 11.433 + sodipodi:role="line" 11.434 + x="196.71785" 11.435 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 11.436 + </g> 11.437 + </g> 11.438 + <g 11.439 + id="g4868" 11.440 + transform="translate(-1.676208,-2.342463e-5)"> 11.441 + <rect 11.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" 11.443 + id="rect3567" 11.444 + width="101.60232" 11.445 + height="89.506805" 11.446 + x="213.26137" 11.447 + y="59.171272" /> 11.448 + <g 11.449 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 11.450 + id="g3573"> 11.451 + <rect 11.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" 11.453 + id="rect3575" 11.454 + width="103.14286" 11.455 + height="48.571426" 11.456 + x="188.6071" 11.457 + y="447.72418" /> 11.458 + <text 11.459 + xml:space="preserve" 11.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" 11.461 + x="197.82495" 11.462 + y="464.82358" 11.463 + id="text3577"><tspan 11.464 + id="tspan3579" 11.465 + sodipodi:role="line" 11.466 + x="197.82495" 11.467 + y="464.82358">First parent</tspan></text> 11.468 + <text 11.469 + xml:space="preserve" 11.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" 11.471 + x="197.13031" 11.472 + y="485.51224" 11.473 + id="text3581"><tspan 11.474 + sodipodi:role="line" 11.475 + id="tspan3583" 11.476 + x="197.13031" 11.477 + y="485.51224" 11.478 + style="font-family:Courier">34b8b7a15ea1</tspan></text> 11.479 + </g> 11.480 + <g 11.481 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 11.482 + id="g3585"> 11.483 + <rect 11.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" 11.485 + id="rect3587" 11.486 + width="103.14286" 11.487 + height="48.571426" 11.488 + x="299.67859" 11.489 + y="447.71451" /> 11.490 + <text 11.491 + xml:space="preserve" 11.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" 11.493 + x="308.89639" 11.494 + y="464.8139" 11.495 + id="text3589"><tspan 11.496 + id="tspan3591" 11.497 + sodipodi:role="line" 11.498 + x="308.89639" 11.499 + y="464.8139">Second parent</tspan></text> 11.500 + <text 11.501 + xml:space="preserve" 11.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" 11.503 + x="308.20175" 11.504 + y="485.50256" 11.505 + id="text3593"><tspan 11.506 + sodipodi:role="line" 11.507 + id="tspan3595" 11.508 + x="308.20175" 11.509 + y="485.50256" 11.510 + style="font-family:Courier">000000000000</tspan></text> 11.511 + </g> 11.512 + <g 11.513 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01733)" 11.514 + id="g3597"> 11.515 + <rect 11.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" 11.517 + id="rect3599" 11.518 + width="103.14286" 11.519 + height="48.571426" 11.520 + x="188.6071" 11.521 + y="311.28598" /> 11.522 + <text 11.523 + xml:space="preserve" 11.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" 11.525 + x="197.82495" 11.526 + y="328.38538" 11.527 + id="text3601"><tspan 11.528 + id="tspan3603" 11.529 + sodipodi:role="line" 11.530 + x="197.82495" 11.531 + y="328.38538">Revision hash</tspan></text> 11.532 + <text 11.533 + xml:space="preserve" 11.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" 11.535 + x="197.13031" 11.536 + y="349.07404" 11.537 + id="text3605"><tspan 11.538 + sodipodi:role="line" 11.539 + id="tspan3607" 11.540 + x="197.13031" 11.541 + y="349.07404" 11.542 + style="font-family:Courier">1b67dc96f27a</tspan></text> 11.543 + </g> 11.544 + <g 11.545 + transform="matrix(0.423343,0,0,0.423343,139.3426,-65.65866)" 11.546 + id="g3609"> 11.547 + <rect 11.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" 11.549 + id="rect3611" 11.550 + width="213.85715" 11.551 + height="75" 11.552 + x="187.5" 11.553 + y="363.07654" /> 11.554 + <text 11.555 + xml:space="preserve" 11.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" 11.557 + x="196.02321" 11.558 + y="400.86459" 11.559 + id="text3613"><tspan 11.560 + sodipodi:role="line" 11.561 + id="tspan3615" 11.562 + x="196.02321" 11.563 + y="400.86459" 11.564 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 11.565 + <text 11.566 + xml:space="preserve" 11.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" 11.568 + x="196.71785" 11.569 + y="380.17593" 11.570 + id="text3617"><tspan 11.571 + style="fill:black;fill-opacity:1" 11.572 + id="tspan3619" 11.573 + sodipodi:role="line" 11.574 + x="196.71785" 11.575 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 11.576 + </g> 11.577 + </g> 11.578 + <path 11.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)" 11.580 + d="M 240.78255,143.08593 L 241.42595,171.75349" 11.581 + id="path3801" 11.582 + inkscape:connector-type="polyline" 11.583 + inkscape:connection-start="#g3573" 11.584 + inkscape:connection-end="#g3250" /> 11.585 + <g 11.586 + id="g5677"> 11.587 + <rect 11.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" 11.589 + id="rect3393" 11.590 + width="101.60232" 11.591 + height="89.506805" 11.592 + x="150.76137" 11.593 + y="278.32565" /> 11.594 + <g 11.595 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 11.596 + id="g3399"> 11.597 + <rect 11.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" 11.599 + id="rect3401" 11.600 + width="103.14286" 11.601 + height="48.571426" 11.602 + x="188.6071" 11.603 + y="447.72418" /> 11.604 + <text 11.605 + xml:space="preserve" 11.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" 11.607 + x="197.82495" 11.608 + y="464.82358" 11.609 + id="text3403"><tspan 11.610 + id="tspan3405" 11.611 + sodipodi:role="line" 11.612 + x="197.82495" 11.613 + y="464.82358">First parent</tspan></text> 11.614 + <text 11.615 + xml:space="preserve" 11.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" 11.617 + x="197.13031" 11.618 + y="485.51224" 11.619 + id="text3407"><tspan 11.620 + sodipodi:role="line" 11.621 + id="tspan3409" 11.622 + x="197.13031" 11.623 + y="485.51224" 11.624 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 11.625 + </g> 11.626 + <g 11.627 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 11.628 + id="g3411"> 11.629 + <rect 11.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" 11.631 + id="rect3413" 11.632 + width="103.14286" 11.633 + height="48.571426" 11.634 + x="299.67859" 11.635 + y="447.71451" /> 11.636 + <text 11.637 + xml:space="preserve" 11.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" 11.639 + x="308.89639" 11.640 + y="464.8139" 11.641 + id="text3415"><tspan 11.642 + id="tspan3417" 11.643 + sodipodi:role="line" 11.644 + x="308.89639" 11.645 + y="464.8139">Second parent</tspan></text> 11.646 + <text 11.647 + xml:space="preserve" 11.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" 11.649 + x="308.20175" 11.650 + y="485.50256" 11.651 + id="text3419"><tspan 11.652 + sodipodi:role="line" 11.653 + id="tspan3421" 11.654 + x="308.20175" 11.655 + y="485.50256" 11.656 + style="font-family:Courier">000000000000</tspan></text> 11.657 + </g> 11.658 + <g 11.659 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 11.660 + id="g3423"> 11.661 + <rect 11.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" 11.663 + id="rect3425" 11.664 + width="103.14286" 11.665 + height="48.571426" 11.666 + x="188.6071" 11.667 + y="311.28598" /> 11.668 + <text 11.669 + xml:space="preserve" 11.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" 11.671 + x="197.82495" 11.672 + y="328.38538" 11.673 + id="text3427"><tspan 11.674 + id="tspan3429" 11.675 + sodipodi:role="line" 11.676 + x="197.82495" 11.677 + y="328.38538">Revision hash</tspan></text> 11.678 + <text 11.679 + xml:space="preserve" 11.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" 11.681 + x="197.13031" 11.682 + y="349.07404" 11.683 + id="text3431"><tspan 11.684 + sodipodi:role="line" 11.685 + id="tspan3433" 11.686 + x="197.13031" 11.687 + y="349.07404" 11.688 + style="font-family:Courier">5b80c922ebdd</tspan></text> 11.689 + </g> 11.690 + <g 11.691 + transform="matrix(0.423343,0,0,0.423343,76.84265,153.4957)" 11.692 + id="g3435"> 11.693 + <rect 11.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" 11.695 + id="rect3437" 11.696 + width="213.85715" 11.697 + height="75" 11.698 + x="187.5" 11.699 + y="363.07654" /> 11.700 + <text 11.701 + xml:space="preserve" 11.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" 11.703 + x="196.02321" 11.704 + y="400.86459" 11.705 + id="text3439"><tspan 11.706 + sodipodi:role="line" 11.707 + id="tspan3441" 11.708 + x="196.02321" 11.709 + y="400.86459" 11.710 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 11.711 + <text 11.712 + xml:space="preserve" 11.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" 11.714 + x="196.71785" 11.715 + y="380.17593" 11.716 + id="text3443"><tspan 11.717 + style="fill:black;fill-opacity:1" 11.718 + id="tspan3445" 11.719 + sodipodi:role="line" 11.720 + x="196.71785" 11.721 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 11.722 + </g> 11.723 + </g> 11.724 + <g 11.725 + id="g5646" 11.726 + transform="translate(-0.227432,0)"> 11.727 + <rect 11.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" 11.729 + id="rect3451" 11.730 + width="101.60232" 11.731 + height="89.506805" 11.732 + x="272.63638" 11.733 + y="278.32565" /> 11.734 + <g 11.735 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 11.736 + id="g3457"> 11.737 + <rect 11.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" 11.739 + id="rect3459" 11.740 + width="103.14286" 11.741 + height="48.571426" 11.742 + x="188.6071" 11.743 + y="447.72418" /> 11.744 + <text 11.745 + xml:space="preserve" 11.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" 11.747 + x="197.82495" 11.748 + y="464.82358" 11.749 + id="text3461"><tspan 11.750 + id="tspan3463" 11.751 + sodipodi:role="line" 11.752 + x="197.82495" 11.753 + y="464.82358">First parent</tspan></text> 11.754 + <text 11.755 + xml:space="preserve" 11.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" 11.757 + x="197.13031" 11.758 + y="485.51224" 11.759 + id="text3465"><tspan 11.760 + sodipodi:role="line" 11.761 + id="tspan3467" 11.762 + x="197.13031" 11.763 + y="485.51224" 11.764 + style="font-family:Courier">ecacb6b4c9fd</tspan></text> 11.765 + </g> 11.766 + <g 11.767 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 11.768 + id="g3469"> 11.769 + <rect 11.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" 11.771 + id="rect3471" 11.772 + width="103.14286" 11.773 + height="48.571426" 11.774 + x="299.67859" 11.775 + y="447.71451" /> 11.776 + <text 11.777 + xml:space="preserve" 11.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" 11.779 + x="308.89639" 11.780 + y="464.8139" 11.781 + id="text3473"><tspan 11.782 + id="tspan3475" 11.783 + sodipodi:role="line" 11.784 + x="308.89639" 11.785 + y="464.8139">Second parent</tspan></text> 11.786 + <text 11.787 + xml:space="preserve" 11.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" 11.789 + x="308.20175" 11.790 + y="485.50256" 11.791 + id="text3477"><tspan 11.792 + sodipodi:role="line" 11.793 + id="tspan3479" 11.794 + x="308.20175" 11.795 + y="485.50256" 11.796 + style="font-family:Courier">000000000000</tspan></text> 11.797 + </g> 11.798 + <g 11.799 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 11.800 + id="g3481"> 11.801 + <rect 11.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" 11.803 + id="rect3483" 11.804 + width="103.14286" 11.805 + height="48.571426" 11.806 + x="188.6071" 11.807 + y="311.28598" /> 11.808 + <text 11.809 + xml:space="preserve" 11.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" 11.811 + x="197.82495" 11.812 + y="328.38538" 11.813 + id="text3485"><tspan 11.814 + id="tspan3487" 11.815 + sodipodi:role="line" 11.816 + x="197.82495" 11.817 + y="328.38538">Revision hash</tspan></text> 11.818 + <text 11.819 + xml:space="preserve" 11.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" 11.821 + x="197.13031" 11.822 + y="349.07404" 11.823 + id="text3489"><tspan 11.824 + sodipodi:role="line" 11.825 + id="tspan3491" 11.826 + x="197.13031" 11.827 + y="349.07404" 11.828 + style="font-family:Courier">32bf9a5f22c0</tspan></text> 11.829 + </g> 11.830 + <g 11.831 + transform="matrix(0.423343,0,0,0.423343,198.7176,153.4957)" 11.832 + id="g3493"> 11.833 + <rect 11.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" 11.835 + id="rect3495" 11.836 + width="213.85715" 11.837 + height="75" 11.838 + x="187.5" 11.839 + y="363.07654" /> 11.840 + <text 11.841 + xml:space="preserve" 11.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" 11.843 + x="196.02321" 11.844 + y="400.86459" 11.845 + id="text3497"><tspan 11.846 + sodipodi:role="line" 11.847 + id="tspan3499" 11.848 + x="196.02321" 11.849 + y="400.86459" 11.850 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 11.851 + <text 11.852 + xml:space="preserve" 11.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" 11.854 + x="196.71785" 11.855 + y="380.17593" 11.856 + id="text3501"><tspan 11.857 + style="fill:black;fill-opacity:1" 11.858 + id="tspan3503" 11.859 + sodipodi:role="line" 11.860 + x="196.71785" 11.861 + y="380.17593">Revision data (delta or snapshot)</tspan></text> 11.862 + </g> 11.863 + </g> 11.864 + <rect 11.865 + y="387.90286" 11.866 + x="272.40894" 11.867 + height="89.506805" 11.868 + width="101.60232" 11.869 + id="rect5081" 11.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" /> 11.871 + <g 11.872 + id="g5087" 11.873 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 11.874 + <rect 11.875 + y="447.72418" 11.876 + x="188.6071" 11.877 + height="48.571426" 11.878 + width="103.14286" 11.879 + id="rect5089" 11.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" /> 11.881 + <text 11.882 + id="text5091" 11.883 + y="464.82358" 11.884 + x="197.82495" 11.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" 11.886 + xml:space="preserve"><tspan 11.887 + y="464.82358" 11.888 + x="197.82495" 11.889 + sodipodi:role="line" 11.890 + id="tspan5093">First parent</tspan></text> 11.891 + <text 11.892 + id="text5095" 11.893 + y="485.51224" 11.894 + x="197.13031" 11.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" 11.896 + xml:space="preserve"><tspan 11.897 + style="font-family:Courier" 11.898 + y="485.51224" 11.899 + x="197.13031" 11.900 + id="tspan5097" 11.901 + sodipodi:role="line">ff9dc8bc2a8b</tspan></text> 11.902 + </g> 11.903 + <g 11.904 + id="g5099" 11.905 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 11.906 + <rect 11.907 + y="447.71451" 11.908 + x="299.67859" 11.909 + height="48.571426" 11.910 + width="103.14286" 11.911 + id="rect5101" 11.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" /> 11.913 + <text 11.914 + id="text5103" 11.915 + y="464.8139" 11.916 + x="308.89639" 11.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" 11.918 + xml:space="preserve"><tspan 11.919 + y="464.8139" 11.920 + x="308.89639" 11.921 + sodipodi:role="line" 11.922 + id="tspan5105">Second parent</tspan></text> 11.923 + <text 11.924 + id="text5107" 11.925 + y="485.50256" 11.926 + x="308.20175" 11.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" 11.928 + xml:space="preserve"><tspan 11.929 + style="font-family:Courier" 11.930 + y="485.50256" 11.931 + x="308.20175" 11.932 + id="tspan5109" 11.933 + sodipodi:role="line">000000000000</tspan></text> 11.934 + </g> 11.935 + <g 11.936 + id="g5111" 11.937 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 11.938 + <rect 11.939 + y="311.28598" 11.940 + x="188.6071" 11.941 + height="48.571426" 11.942 + width="103.14286" 11.943 + id="rect5113" 11.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" /> 11.945 + <text 11.946 + id="text5115" 11.947 + y="328.38538" 11.948 + x="197.82495" 11.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" 11.950 + xml:space="preserve"><tspan 11.951 + y="328.38538" 11.952 + x="197.82495" 11.953 + sodipodi:role="line" 11.954 + id="tspan5117">Revision hash</tspan></text> 11.955 + <text 11.956 + id="text5119" 11.957 + y="349.07404" 11.958 + x="197.13031" 11.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" 11.960 + xml:space="preserve"><tspan 11.961 + style="font-family:Courier" 11.962 + y="349.07404" 11.963 + x="197.13031" 11.964 + id="tspan5121" 11.965 + sodipodi:role="line">ecacb6b4c9fd</tspan></text> 11.966 + </g> 11.967 + <g 11.968 + id="g5123" 11.969 + transform="matrix(0.423343,0,0,0.423343,198.4901,263.0729)"> 11.970 + <rect 11.971 + y="363.07654" 11.972 + x="187.5" 11.973 + height="75" 11.974 + width="213.85715" 11.975 + id="rect5125" 11.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" /> 11.977 + <text 11.978 + id="text5127" 11.979 + y="400.86459" 11.980 + x="196.02321" 11.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" 11.982 + xml:space="preserve"><tspan 11.983 + style="fill:black;fill-opacity:1;font-family:Courier" 11.984 + y="400.86459" 11.985 + x="196.02321" 11.986 + id="tspan5129" 11.987 + sodipodi:role="line">...</tspan></text> 11.988 + <text 11.989 + id="text5131" 11.990 + y="380.17593" 11.991 + x="196.71785" 11.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" 11.993 + xml:space="preserve"><tspan 11.994 + y="380.17593" 11.995 + x="196.71785" 11.996 + sodipodi:role="line" 11.997 + id="tspan5133" 11.998 + style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 11.999 + </g> 11.1000 + <path 11.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" 11.1002 + d="M 299.69935,362.24027 L 299.69931,393.49494" 11.1003 + id="path5203" 11.1004 + inkscape:connector-type="polyline" 11.1005 + inkscape:connection-start="#g3457" 11.1006 + inkscape:connection-end="#g5111" /> 11.1007 + <path 11.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" 11.1009 + d="M 182.35357,362.22647 L 241.2842,503.07224" 11.1010 + id="path5271" 11.1011 + inkscape:connector-type="polyline" 11.1012 + inkscape:connection-start="#g3399" 11.1013 + inkscape:connection-end="#g3539" /> 11.1014 + <path 11.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" 11.1016 + d="M 287.63109,471.81747 L 250.9438,503.07223" 11.1017 + id="path5285" 11.1018 + inkscape:connector-type="polyline" 11.1019 + inkscape:connection-start="#g5087" 11.1020 + inkscape:connection-end="#g3539" /> 11.1021 + <path 11.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)" 11.1023 + d="M 290.80419,250.07192 L 297.80065,283.90394" 11.1024 + id="path5077" 11.1025 + inkscape:connector-type="polyline" 11.1026 + inkscape:connection-start="#g3215" 11.1027 + inkscape:connection-end="#g3481" /> 11.1028 + <path 11.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)" 11.1030 + d="M 229.63373,250.07601 L 190.07484,283.90394" 11.1031 + id="path5075" 11.1032 + inkscape:connector-type="polyline" 11.1033 + inkscape:connection-end="#g3423" /> 11.1034 + <text 11.1035 + xml:space="preserve" 11.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" 11.1037 + x="131.5625" 11.1038 + y="100.79968" 11.1039 + id="text5897"><tspan 11.1040 + sodipodi:role="line" 11.1041 + id="tspan5899" 11.1042 + x="131.5625" 11.1043 + y="100.79968" 11.1044 + style="text-align:end;text-anchor:end">Head revision</tspan><tspan 11.1045 + sodipodi:role="line" 11.1046 + x="131.5625" 11.1047 + y="115.79968" 11.1048 + id="tspan5901" 11.1049 + style="text-align:end;text-anchor:end">(no children)</tspan></text> 11.1050 + <text 11.1051 + xml:space="preserve" 11.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" 11.1053 + x="131.5625" 11.1054 + y="207.04968" 11.1055 + id="text5903"><tspan 11.1056 + sodipodi:role="line" 11.1057 + id="tspan5905" 11.1058 + x="131.5625" 11.1059 + y="207.04968" 11.1060 + style="text-align:end;text-anchor:end">Merge revision</tspan><tspan 11.1061 + sodipodi:role="line" 11.1062 + x="131.5625" 11.1063 + y="222.04968" 11.1064 + id="tspan5907" 11.1065 + style="text-align:end;text-anchor:end">(two parents)</tspan></text> 11.1066 + <text 11.1067 + xml:space="preserve" 11.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" 11.1069 + x="131.92578" 11.1070 + y="451.58093" 11.1071 + id="text5909"><tspan 11.1072 + sodipodi:role="line" 11.1073 + id="tspan5911" 11.1074 + x="131.92578" 11.1075 + y="451.58093" 11.1076 + style="text-align:end;text-anchor:end">Branches</tspan><tspan 11.1077 + sodipodi:role="line" 11.1078 + x="131.92578" 11.1079 + y="466.58093" 11.1080 + id="tspan5913" 11.1081 + style="text-align:end;text-anchor:end">(two revisions,</tspan><tspan 11.1082 + sodipodi:role="line" 11.1083 + x="131.92578" 11.1084 + y="481.58093" 11.1085 + id="tspan5915" 11.1086 + style="text-align:end;text-anchor:end">same parent)</tspan></text> 11.1087 + <path 11.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" 11.1089 + d="M 111.71875,433.61218 L 154.7268,368.52294" 11.1090 + id="path5917" 11.1091 + inkscape:connector-type="polyline" /> 11.1092 + <path 11.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" 11.1094 + d="M 134.375,464.86218 L 277.86691,440.37816" 11.1095 + id="path5919" 11.1096 + inkscape:connector-type="polyline" 11.1097 + inkscape:connection-end="#g5123" /> 11.1098 + <text 11.1099 + xml:space="preserve" 11.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" 11.1101 + x="131.5625" 11.1102 + y="536.73718" 11.1103 + id="text5927"><tspan 11.1104 + sodipodi:role="line" 11.1105 + id="tspan5929" 11.1106 + x="131.5625" 11.1107 + y="536.73718">First revision</tspan><tspan 11.1108 + sodipodi:role="line" 11.1109 + x="131.5625" 11.1110 + y="551.73718" 11.1111 + id="tspan5931">(both parents null)</tspan></text> 11.1112 + <rect 11.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" 11.1114 + id="rect2830" 11.1115 + width="43.664806" 11.1116 + height="20.562374" 11.1117 + x="217.0432" 11.1118 + y="232.10075" /> 11.1119 + <text 11.1120 + xml:space="preserve" 11.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" 11.1122 + x="220.94551" 11.1123 + y="239.33966" 11.1124 + id="text2832"><tspan 11.1125 + id="tspan2836" 11.1126 + sodipodi:role="line" 11.1127 + x="220.94551" 11.1128 + y="239.33966">First parent</tspan></text> 11.1129 + <text 11.1130 + xml:space="preserve" 11.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" 11.1132 + x="220.65144" 11.1133 + y="248.09805" 11.1134 + id="text2879"><tspan 11.1135 + sodipodi:role="line" 11.1136 + id="tspan2881" 11.1137 + x="220.65144" 11.1138 + y="248.09805" 11.1139 + style="font-family:Courier">5b80c922ebdd</tspan></text> 11.1140 + <path 11.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" 11.1142 + d="M 139.84375,107.83093 L 210.15625,107.83093" 11.1143 + id="path5965" 11.1144 + inkscape:connector-type="polyline" /> 11.1145 + <path 11.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" 11.1147 + d="M 137.5,213.29968 L 210.49036,214.09055" 11.1148 + id="path5967" 11.1149 + inkscape:connector-type="polyline" /> 11.1150 + <path 11.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" 11.1152 + d="M 136.34375,544.54968 L 206.65625,544.54968" 11.1153 + id="path5969" 11.1154 + inkscape:connector-type="polyline" 11.1155 + inkscape:transform-center-y="-171.09375" 11.1156 + inkscape:transform-center-x="53.90625" /> 11.1157 + </g> 11.1158 +</svg>
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/en/figs/snapshot.svg Tue Mar 10 21:58:03 2009 -0700 12.3 @@ -0,0 +1,202 @@ 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="svg2807" 12.17 + sodipodi:version="0.32" 12.18 + inkscape:version="0.44.1" 12.19 + sodipodi:docbase="/home/bos/hg/hgbook/en" 12.20 + sodipodi:docname="snapshots.svg"> 12.21 + <defs 12.22 + id="defs2809" /> 12.23 + <sodipodi:namedview 12.24 + id="base" 12.25 + pagecolor="#ffffff" 12.26 + bordercolor="#666666" 12.27 + borderopacity="1.0" 12.28 + gridtolerance="10000" 12.29 + guidetolerance="10" 12.30 + objecttolerance="10" 12.31 + inkscape:pageopacity="0.0" 12.32 + inkscape:pageshadow="2" 12.33 + inkscape:zoom="1.4" 12.34 + inkscape:cx="252.04111" 12.35 + inkscape:cy="605.75448" 12.36 + inkscape:document-units="px" 12.37 + inkscape:current-layer="layer1" 12.38 + inkscape:window-width="906" 12.39 + inkscape:window-height="721" 12.40 + inkscape:window-x="0" 12.41 + inkscape:window-y="25" /> 12.42 + <metadata 12.43 + id="metadata2812"> 12.44 + <rdf:RDF> 12.45 + <cc:Work 12.46 + rdf:about=""> 12.47 + <dc:format>image/svg+xml</dc:format> 12.48 + <dc:type 12.49 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 12.50 + </cc:Work> 12.51 + </rdf:RDF> 12.52 + </metadata> 12.53 + <g 12.54 + inkscape:label="Layer 1" 12.55 + inkscape:groupmode="layer" 12.56 + id="layer1"> 12.57 + <rect 12.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" 12.59 + id="rect2817" 12.60 + width="118.18347" 12.61 + height="245.32632" 12.62 + x="243.05112" 12.63 + y="315.4133" 12.64 + inkscape:transform-center-x="136.84403" 12.65 + inkscape:transform-center-y="-66.529183" /> 12.66 + <rect 12.67 + y="315.04153" 12.68 + x="46.965065" 12.69 + height="97.803009" 12.70 + width="108.92702" 12.71 + id="rect2815" 12.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" /> 12.73 + <g 12.74 + id="g3814"> 12.75 + <rect 12.76 + y="348.94302" 12.77 + x="59.285713" 12.78 + height="30" 12.79 + width="84.285713" 12.80 + id="rect2819" 12.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" 12.82 + ry="0" /> 12.83 + <text 12.84 + id="text2821" 12.85 + y="368.02701" 12.86 + x="72.717636" 12.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" 12.88 + xml:space="preserve"><tspan 12.89 + y="368.02701" 12.90 + x="72.717636" 12.91 + id="tspan2823" 12.92 + sodipodi:role="line">Index, rev 7</tspan></text> 12.93 + </g> 12.94 + <text 12.95 + id="text3722" 12.96 + y="301.29074" 12.97 + x="46.187778" 12.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" 12.99 + xml:space="preserve"><tspan 12.100 + y="301.29074" 12.101 + x="46.187778" 12.102 + id="tspan3724" 12.103 + sodipodi:role="line">Revlog index (.i file)</tspan></text> 12.104 + <text 12.105 + id="text3726" 12.106 + y="301.29074" 12.107 + x="241.90207" 12.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" 12.109 + xml:space="preserve"><tspan 12.110 + y="301.29074" 12.111 + x="241.90207" 12.112 + id="tspan3728" 12.113 + sodipodi:role="line">Revlog data (.d file)</tspan></text> 12.114 + <path 12.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" 12.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 " 12.117 + id="path3839" 12.118 + sodipodi:nodetypes="ccccc" /> 12.119 + <rect 12.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" 12.121 + id="rect3752" 12.122 + width="92.720184" 12.123 + height="67.005905" 12.124 + x="255.42564" 12.125 + y="368.64264" /> 12.126 + <text 12.127 + xml:space="preserve" 12.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" 12.129 + x="264.45859" 12.130 + y="387.30099" 12.131 + id="text3754"><tspan 12.132 + sodipodi:role="line" 12.133 + id="tspan3756" 12.134 + x="264.45859" 12.135 + y="387.30099">Snapshot, rev 4</tspan></text> 12.136 + <rect 12.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" 12.138 + id="rect3761" 12.139 + width="93.49366" 12.140 + height="29.922237" 12.141 + x="255.03891" 12.142 + y="442.04395" /> 12.143 + <text 12.144 + xml:space="preserve" 12.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" 12.146 + x="263.2662" 12.147 + y="460.17206" 12.148 + id="text3763"><tspan 12.149 + sodipodi:role="line" 12.150 + id="tspan3765" 12.151 + x="263.2662" 12.152 + y="460.17206">Delta, rev 4 to 5</tspan></text> 12.153 + <rect 12.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" 12.155 + id="rect3774" 12.156 + width="93.49366" 12.157 + height="29.922237" 12.158 + x="255.03891" 12.159 + y="477.97485" /> 12.160 + <text 12.161 + xml:space="preserve" 12.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" 12.163 + x="263.2662" 12.164 + y="496.10297" 12.165 + id="text3776"><tspan 12.166 + sodipodi:role="line" 12.167 + id="tspan3778" 12.168 + x="263.2662" 12.169 + y="496.10297">Delta, rev 5 to 6</tspan></text> 12.170 + <rect 12.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" 12.172 + id="rect3782" 12.173 + width="93.49366" 12.174 + height="29.922237" 12.175 + x="255.03891" 12.176 + y="513.90576" /> 12.177 + <text 12.178 + xml:space="preserve" 12.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" 12.180 + x="263.2662" 12.181 + y="532.03387" 12.182 + id="text3784"><tspan 12.183 + sodipodi:role="line" 12.184 + id="tspan3786" 12.185 + x="263.2662" 12.186 + y="532.03387">Delta, rev 6 to 7</tspan></text> 12.187 + <rect 12.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" 12.189 + id="rect3889" 12.190 + width="93.49366" 12.191 + height="29.922237" 12.192 + x="255.03891" 12.193 + y="332.32489" /> 12.194 + <text 12.195 + xml:space="preserve" 12.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" 12.197 + x="263.2662" 12.198 + y="350.453" 12.199 + id="text3891"><tspan 12.200 + sodipodi:role="line" 12.201 + id="tspan3893" 12.202 + x="263.2662" 12.203 + y="350.453">Delta, rev 2 to 3</tspan></text> 12.204 + </g> 12.205 +</svg>
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/en/figs/tour-history.svg Tue Mar 10 21:58:03 2009 -0700 13.3 @@ -0,0 +1,289 @@ 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-history.svg"> 13.20 + <defs 13.21 + id="defs4"> 13.22 + <marker 13.23 + inkscape:stockid="Arrow1Mstart" 13.24 + orient="auto" 13.25 + refY="0.0" 13.26 + refX="0.0" 13.27 + id="Arrow1Mstart" 13.28 + style="overflow:visible"> 13.29 + <path 13.30 + id="path2973" 13.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 " 13.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 13.33 + transform="scale(0.4) translate(10,0)" /> 13.34 + </marker> 13.35 + <marker 13.36 + inkscape:stockid="Arrow1Mend" 13.37 + orient="auto" 13.38 + refY="0.0" 13.39 + refX="0.0" 13.40 + id="Arrow1Mend" 13.41 + style="overflow:visible;"> 13.42 + <path 13.43 + id="path3066" 13.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 " 13.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 13.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 13.47 + </marker> 13.48 + </defs> 13.49 + <sodipodi:namedview 13.50 + id="base" 13.51 + pagecolor="#ffffff" 13.52 + bordercolor="#666666" 13.53 + borderopacity="1.0" 13.54 + gridtolerance="10000" 13.55 + guidetolerance="10" 13.56 + objecttolerance="10" 13.57 + inkscape:pageopacity="0.0" 13.58 + inkscape:pageshadow="2" 13.59 + inkscape:zoom="1.4" 13.60 + inkscape:cx="232.14286" 13.61 + inkscape:cy="672.75296" 13.62 + inkscape:document-units="px" 13.63 + inkscape:current-layer="layer1" 13.64 + inkscape:window-width="906" 13.65 + inkscape:window-height="620" 13.66 + inkscape:window-x="5" 13.67 + inkscape:window-y="49" /> 13.68 + <metadata 13.69 + id="metadata7"> 13.70 + <rdf:RDF> 13.71 + <cc:Work 13.72 + rdf:about=""> 13.73 + <dc:format>image/svg+xml</dc:format> 13.74 + <dc:type 13.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 13.76 + </cc:Work> 13.77 + </rdf:RDF> 13.78 + </metadata> 13.79 + <g 13.80 + inkscape:label="Layer 1" 13.81 + inkscape:groupmode="layer" 13.82 + id="layer1"> 13.83 + <rect 13.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" 13.85 + id="rect1878" 13.86 + width="94.285713" 13.87 + height="20.714285" 13.88 + x="138" 13.89 + y="479.50504" /> 13.90 + <text 13.91 + xml:space="preserve" 13.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" 13.93 + x="162.09892" 13.94 + y="493.12619" 13.95 + id="text1872"><tspan 13.96 + sodipodi:role="line" 13.97 + id="tspan1874" 13.98 + x="162.09892" 13.99 + y="493.12619" 13.100 + style="font-family:Courier"><tspan 13.101 + style="font-weight:bold" 13.102 + id="tspan1876">0</tspan>: REV0</tspan></text> 13.103 + <rect 13.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" 13.105 + id="rect2800" 13.106 + width="94.285713" 13.107 + height="20.714285" 13.108 + x="138" 13.109 + y="432.63004" /> 13.110 + <text 13.111 + xml:space="preserve" 13.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" 13.113 + x="162.09892" 13.114 + y="446.25119" 13.115 + id="text2794"><tspan 13.116 + sodipodi:role="line" 13.117 + id="tspan2796" 13.118 + x="162.09892" 13.119 + y="446.25119" 13.120 + style="font-family:Courier"><tspan 13.121 + id="tspan2868" 13.122 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 13.123 + <rect 13.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" 13.125 + id="rect2810" 13.126 + width="94.285713" 13.127 + height="20.714285" 13.128 + x="138" 13.129 + y="385.75504" /> 13.130 + <text 13.131 + xml:space="preserve" 13.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" 13.133 + x="162.09892" 13.134 + y="399.37619" 13.135 + id="text2804"><tspan 13.136 + sodipodi:role="line" 13.137 + id="tspan2806" 13.138 + x="162.09892" 13.139 + y="399.37619" 13.140 + style="font-family:Courier"><tspan 13.141 + style="font-weight:bold" 13.142 + id="tspan2866">2</tspan>: REV2</tspan></text> 13.143 + <rect 13.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" 13.145 + id="rect2820" 13.146 + width="94.285713" 13.147 + height="20.714285" 13.148 + x="138" 13.149 + y="338.88007" /> 13.150 + <text 13.151 + xml:space="preserve" 13.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" 13.153 + x="162.09892" 13.154 + y="352.50122" 13.155 + id="text2814"><tspan 13.156 + sodipodi:role="line" 13.157 + id="tspan2816" 13.158 + x="162.09892" 13.159 + y="352.50122" 13.160 + style="font-family:Courier"><tspan 13.161 + style="font-weight:bold" 13.162 + id="tspan2864">3</tspan>: REV3</tspan></text> 13.163 + <rect 13.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" 13.165 + id="rect2830" 13.166 + width="94.285713" 13.167 + height="20.714285" 13.168 + x="138" 13.169 + y="292.00504" /> 13.170 + <text 13.171 + xml:space="preserve" 13.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" 13.173 + x="162.09892" 13.174 + y="305.62619" 13.175 + id="text2824"><tspan 13.176 + sodipodi:role="line" 13.177 + id="tspan2826" 13.178 + x="162.09892" 13.179 + y="305.62619" 13.180 + style="font-family:Courier"><tspan 13.181 + style="font-weight:bold" 13.182 + id="tspan2862">4</tspan>: REV4</tspan></text> 13.183 + <text 13.184 + xml:space="preserve" 13.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" 13.186 + x="173.57143" 13.187 + y="443.79074" 13.188 + id="text2832"><tspan 13.189 + sodipodi:role="line" 13.190 + id="tspan2834" 13.191 + x="173.57143" 13.192 + y="443.79074" /></text> 13.193 + <path 13.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)" 13.195 + d="M 185.14286,478.50504 L 185.14286,454.34432" 13.196 + id="path2894" 13.197 + inkscape:connector-type="polyline" /> 13.198 + <path 13.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)" 13.200 + d="M 185.14286,431.63004 L 185.14286,407.46932" 13.201 + id="path2896" 13.202 + inkscape:connector-type="polyline" /> 13.203 + <path 13.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)" 13.205 + d="M 185.14286,384.75504 L 185.14286,360.59435" 13.206 + id="path2898" 13.207 + inkscape:connector-type="polyline" /> 13.208 + <path 13.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)" 13.210 + d="M 185.14286,337.88007 L 185.14286,313.71932" 13.211 + id="path2900" 13.212 + inkscape:connector-type="polyline" /> 13.213 + <text 13.214 + xml:space="preserve" 13.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" 13.216 + x="244.60992" 13.217 + y="305.245" 13.218 + id="text1902"><tspan 13.219 + sodipodi:role="line" 13.220 + id="tspan1904" 13.221 + x="244.60992" 13.222 + y="305.245">(newest)</tspan></text> 13.223 + <text 13.224 + xml:space="preserve" 13.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" 13.226 + x="244.60992" 13.227 + y="492.745" 13.228 + id="text1906"><tspan 13.229 + sodipodi:role="line" 13.230 + id="tspan1908" 13.231 + x="244.60992" 13.232 + y="492.745">(oldest)</tspan></text> 13.233 + <rect 13.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" 13.235 + id="rect1907" 13.236 + width="94.285713" 13.237 + height="20.714285" 13.238 + x="309.28571" 13.239 + y="324.86218" /> 13.240 + <text 13.241 + xml:space="preserve" 13.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" 13.243 + x="333.38464" 13.244 + y="338.48334" 13.245 + id="text1909"><tspan 13.246 + sodipodi:role="line" 13.247 + id="tspan1911" 13.248 + x="333.38464" 13.249 + y="338.48334" 13.250 + style="font-family:Courier"><tspan 13.251 + style="font-weight:bold" 13.252 + id="tspan1913">4</tspan>: REV4</tspan></text> 13.253 + <path 13.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" 13.255 + d="M 332.14286,375.21932 L 335.71429,347.36218" 13.256 + id="path2802" /> 13.257 + <path 13.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" 13.259 + d="M 372.69968,375.21932 L 369.12825,347.36218" 13.260 + id="path2986" /> 13.261 + <text 13.262 + xml:space="preserve" 13.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" 13.264 + x="335.14285" 13.265 + y="387.21933" 13.266 + id="text2988"><tspan 13.267 + sodipodi:role="line" 13.268 + x="335.14285" 13.269 + y="387.21933" 13.270 + id="tspan3020" 13.271 + style="text-align:end;text-anchor:end">revision</tspan><tspan 13.272 + sodipodi:role="line" 13.273 + x="335.14285" 13.274 + y="402.21933" 13.275 + id="tspan3014" 13.276 + style="text-align:end;text-anchor:end">number</tspan></text> 13.277 + <text 13.278 + xml:space="preserve" 13.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" 13.280 + x="368.71429" 13.281 + y="387.21933" 13.282 + id="text2994"><tspan 13.283 + sodipodi:role="line" 13.284 + id="tspan2996" 13.285 + x="368.71429" 13.286 + y="387.21933">changeset</tspan><tspan 13.287 + sodipodi:role="line" 13.288 + x="368.71429" 13.289 + y="402.21933" 13.290 + id="tspan2998">identifier</tspan></text> 13.291 + </g> 13.292 +</svg>
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/en/figs/tour-merge-conflict.svg Tue Mar 10 21:58:03 2009 -0700 14.3 @@ -0,0 +1,210 @@ 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-conflict.svg"> 14.20 + <defs 14.21 + id="defs4"> 14.22 + <marker 14.23 + inkscape:stockid="Arrow1Mend" 14.24 + orient="auto" 14.25 + refY="0.0" 14.26 + refX="0.0" 14.27 + id="Arrow1Mend" 14.28 + style="overflow:visible;"> 14.29 + <path 14.30 + id="path3053" 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) rotate(180) translate(10,0)" /> 14.34 + </marker> 14.35 + </defs> 14.36 + <sodipodi:namedview 14.37 + id="base" 14.38 + pagecolor="#ffffff" 14.39 + bordercolor="#666666" 14.40 + borderopacity="1.0" 14.41 + gridtolerance="10000" 14.42 + guidetolerance="10" 14.43 + objecttolerance="10" 14.44 + inkscape:pageopacity="0.0" 14.45 + inkscape:pageshadow="2" 14.46 + inkscape:zoom="1.4" 14.47 + inkscape:cx="164.78349" 14.48 + inkscape:cy="590.07679" 14.49 + inkscape:document-units="px" 14.50 + inkscape:current-layer="layer1" 14.51 + inkscape:window-width="906" 14.52 + inkscape:window-height="620" 14.53 + inkscape:window-x="5" 14.54 + inkscape:window-y="49" /> 14.55 + <metadata 14.56 + id="metadata7"> 14.57 + <rdf:RDF> 14.58 + <cc:Work 14.59 + rdf:about=""> 14.60 + <dc:format>image/svg+xml</dc:format> 14.61 + <dc:type 14.62 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 14.63 + </cc:Work> 14.64 + </rdf:RDF> 14.65 + </metadata> 14.66 + <g 14.67 + inkscape:label="Layer 1" 14.68 + inkscape:groupmode="layer" 14.69 + id="layer1"> 14.70 + <g 14.71 + id="g1988" 14.72 + transform="translate(84.85711,0)"> 14.73 + <g 14.74 + id="g1876"> 14.75 + <path 14.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" 14.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 " 14.78 + id="path1872" 14.79 + sodipodi:nodetypes="cccccc" /> 14.80 + <path 14.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" 14.82 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 14.83 + id="path1874" 14.84 + sodipodi:nodetypes="cccc" /> 14.85 + </g> 14.86 + <flowRoot 14.87 + style="font-size:8px;font-family:Times New Roman" 14.88 + id="flowRoot1898" 14.89 + xml:space="preserve"><flowRegion 14.90 + id="flowRegion1900"><rect 14.91 + style="font-size:8px;font-family:Times New Roman" 14.92 + y="464.50504" 14.93 + x="122.85714" 14.94 + height="93.571426" 14.95 + width="76.428574" 14.96 + id="rect1902" /></flowRegion><flowPara 14.97 + id="flowPara1904">Greetings!</flowPara><flowPara 14.98 + id="flowPara1906" /><flowPara 14.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> 14.100 + <g 14.101 + id="g1966" 14.102 + transform="translate(82,0.35715)"> 14.103 + <g 14.104 + transform="translate(-77.85718,-140.0714)" 14.105 + id="g1910"> 14.106 + <path 14.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" 14.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 " 14.109 + id="path1912" 14.110 + sodipodi:nodetypes="cccccc" /> 14.111 + <path 14.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" 14.113 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 14.114 + id="path1914" 14.115 + sodipodi:nodetypes="cccc" /> 14.116 + </g> 14.117 + <flowRoot 14.118 + transform="translate(-77.85718,-140.0714)" 14.119 + style="font-size:8px;font-family:Times New Roman" 14.120 + id="flowRoot1916" 14.121 + xml:space="preserve"><flowRegion 14.122 + id="flowRegion1918"><rect 14.123 + style="font-size:8px;font-family:Times New Roman" 14.124 + y="464.50504" 14.125 + x="122.85714" 14.126 + height="93.571426" 14.127 + width="76.428574" 14.128 + id="rect1920" /></flowRegion><flowPara 14.129 + id="flowPara1922">Greetings!</flowPara><flowPara 14.130 + id="flowPara1924" /><flowPara 14.131 + id="flowPara1926">I am <flowSpan 14.132 + style="font-style:italic;fill:red" 14.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> 14.134 + <g 14.135 + id="g1977" 14.136 + transform="translate(81.99999,-0.35715)"> 14.137 + <g 14.138 + transform="translate(83.57141,-139.3571)" 14.139 + id="g1932"> 14.140 + <path 14.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" 14.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 " 14.143 + id="path1934" 14.144 + sodipodi:nodetypes="cccccc" /> 14.145 + <path 14.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" 14.147 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 14.148 + id="path1936" 14.149 + sodipodi:nodetypes="cccc" /> 14.150 + </g> 14.151 + <flowRoot 14.152 + transform="translate(83.57141,-139.3571)" 14.153 + style="font-size:8px;font-family:Times New Roman" 14.154 + id="flowRoot1938" 14.155 + xml:space="preserve"><flowRegion 14.156 + id="flowRegion1940"><rect 14.157 + style="font-size:8px;font-family:Times New Roman" 14.158 + y="464.50504" 14.159 + x="122.85714" 14.160 + height="93.571426" 14.161 + width="76.428574" 14.162 + id="rect1942" /></flowRegion><flowPara 14.163 + id="flowPara1944">Greetings!</flowPara><flowPara 14.164 + id="flowPara1946" /><flowPara 14.165 + id="flowPara1948">I am <flowSpan 14.166 + style="font-style:italic;fill:red" 14.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> 14.168 + <path 14.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" 14.170 + d="M 215.502,457.71933 L 196.35507,424.5765" 14.171 + id="path1999" 14.172 + inkscape:connector-type="polyline" 14.173 + inkscape:connection-start="#g1988" 14.174 + inkscape:connection-end="#g1966" /> 14.175 + <path 14.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" 14.177 + d="M 277.06936,457.71933 L 296.21629,424.5765" 14.178 + id="path2001" 14.179 + inkscape:connector-type="polyline" 14.180 + inkscape:connection-start="#g1988" 14.181 + inkscape:connection-end="#g1977" /> 14.182 + <text 14.183 + xml:space="preserve" 14.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" 14.185 + x="302.42859" 14.186 + y="515.08905" 14.187 + id="text1905"><tspan 14.188 + sodipodi:role="line" 14.189 + id="tspan1907" 14.190 + x="302.42859" 14.191 + y="515.08905">Base version</tspan></text> 14.192 + <text 14.193 + xml:space="preserve" 14.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" 14.195 + x="45.57143" 14.196 + y="374.1619" 14.197 + id="text1917"><tspan 14.198 + sodipodi:role="line" 14.199 + id="tspan1919" 14.200 + x="45.57143" 14.201 + y="374.1619">Our changes</tspan></text> 14.202 + <text 14.203 + xml:space="preserve" 14.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" 14.205 + x="385.71429" 14.206 + y="374.1619" 14.207 + id="text1921"><tspan 14.208 + sodipodi:role="line" 14.209 + id="tspan1923" 14.210 + x="385.71429" 14.211 + y="374.1619">Their changes</tspan></text> 14.212 + </g> 14.213 +</svg>
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/en/figs/tour-merge-merge.svg Tue Mar 10 21:58:03 2009 -0700 15.3 @@ -0,0 +1,380 @@ 15.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 15.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 15.6 +<svg 15.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 15.8 + xmlns:cc="http://web.resource.org/cc/" 15.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 15.10 + xmlns:svg="http://www.w3.org/2000/svg" 15.11 + xmlns="http://www.w3.org/2000/svg" 15.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 15.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 15.14 + width="744.09448819" 15.15 + height="1052.3622047" 15.16 + id="svg2" 15.17 + sodipodi:version="0.32" 15.18 + inkscape:version="0.44.1" 15.19 + sodipodi:docname="tour-merge-merge.svg"> 15.20 + <defs 15.21 + id="defs4"> 15.22 + <marker 15.23 + inkscape:stockid="Arrow1Mstart" 15.24 + orient="auto" 15.25 + refY="0.0" 15.26 + refX="0.0" 15.27 + id="Arrow1Mstart" 15.28 + style="overflow:visible"> 15.29 + <path 15.30 + id="path2973" 15.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 " 15.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 15.33 + transform="scale(0.4) translate(10,0)" /> 15.34 + </marker> 15.35 + <marker 15.36 + inkscape:stockid="Arrow1Mend" 15.37 + orient="auto" 15.38 + refY="0.0" 15.39 + refX="0.0" 15.40 + id="Arrow1Mend" 15.41 + style="overflow:visible;"> 15.42 + <path 15.43 + id="path3066" 15.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 " 15.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 15.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 15.47 + </marker> 15.48 + </defs> 15.49 + <sodipodi:namedview 15.50 + id="base" 15.51 + pagecolor="#ffffff" 15.52 + bordercolor="#666666" 15.53 + borderopacity="1.0" 15.54 + gridtolerance="10000" 15.55 + guidetolerance="10" 15.56 + objecttolerance="10" 15.57 + inkscape:pageopacity="0.0" 15.58 + inkscape:pageshadow="2" 15.59 + inkscape:zoom="1.4" 15.60 + inkscape:cx="247.53795" 15.61 + inkscape:cy="871.05738" 15.62 + inkscape:document-units="px" 15.63 + inkscape:current-layer="layer1" 15.64 + inkscape:window-width="906" 15.65 + inkscape:window-height="620" 15.66 + inkscape:window-x="38" 15.67 + inkscape:window-y="95" /> 15.68 + <metadata 15.69 + id="metadata7"> 15.70 + <rdf:RDF> 15.71 + <cc:Work 15.72 + rdf:about=""> 15.73 + <dc:format>image/svg+xml</dc:format> 15.74 + <dc:type 15.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 15.76 + </cc:Work> 15.77 + </rdf:RDF> 15.78 + </metadata> 15.79 + <g 15.80 + inkscape:label="Layer 1" 15.81 + inkscape:groupmode="layer" 15.82 + id="layer1"> 15.83 + <rect 15.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" 15.85 + id="rect2995" 15.86 + width="94.285713" 15.87 + height="20.714285" 15.88 + x="532.85718" 15.89 + y="203.0479" /> 15.90 + <text 15.91 + xml:space="preserve" 15.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" 15.93 + x="173.57143" 15.94 + y="443.79074" 15.95 + id="text2832"><tspan 15.96 + sodipodi:role="line" 15.97 + id="tspan2834" 15.98 + x="173.57143" 15.99 + y="443.79074" /></text> 15.100 + <rect 15.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" 15.102 + id="rect2830" 15.103 + width="94.285713" 15.104 + height="20.714285" 15.105 + x="138" 15.106 + y="297.76227" /> 15.107 + <text 15.108 + xml:space="preserve" 15.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" 15.110 + x="162.09892" 15.111 + y="311.38342" 15.112 + id="text2824"><tspan 15.113 + sodipodi:role="line" 15.114 + id="tspan2826" 15.115 + x="162.09892" 15.116 + y="311.38342" 15.117 + style="font-family:Courier"><tspan 15.118 + style="font-weight:bold" 15.119 + id="tspan2862">4</tspan>: REV4</tspan></text> 15.120 + <path 15.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" 15.122 + d="M 185.14286,343.63731 L 185.14286,319.47656" 15.123 + id="path2900" 15.124 + inkscape:connector-type="polyline" /> 15.125 + <rect 15.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" 15.127 + id="rect2863" 15.128 + width="94.285713" 15.129 + height="20.714285" 15.130 + x="91.428574" 15.131 + y="250.47656" /> 15.132 + <text 15.133 + xml:space="preserve" 15.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" 15.135 + x="116.09886" 15.136 + y="264.56592" 15.137 + id="text1965" 15.138 + transform="scale(1.000002,0.999998)"><tspan 15.139 + sodipodi:role="line" 15.140 + id="tspan1967" 15.141 + x="116.09886" 15.142 + y="264.56592" 15.143 + style="font-family:Courier"><tspan 15.144 + style="font-weight:bold" 15.145 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 15.146 + <path 15.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" 15.148 + d="M 173.95727,296.76228 L 149.75702,272.19085" 15.149 + id="path1971" 15.150 + inkscape:connector-type="polyline" 15.151 + inkscape:connection-end="#rect2863" 15.152 + inkscape:connection-start="#rect2830" /> 15.153 + <rect 15.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" 15.155 + id="rect2911" 15.156 + width="94.285995" 15.157 + height="20.714283" 15.158 + x="186.71414" 15.159 + y="204.40514" /> 15.160 + <text 15.161 + xml:space="preserve" 15.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" 15.163 + x="210.81311" 15.164 + y="218.02673" 15.165 + id="text2913" 15.166 + transform="scale(1.000002,0.999998)"><tspan 15.167 + sodipodi:role="line" 15.168 + id="tspan2915" 15.169 + x="210.81311" 15.170 + y="218.02673" 15.171 + style="font-family:Courier"><tspan 15.172 + id="tspan1966" 15.173 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 15.174 + <path 15.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" 15.176 + d="M 191.06908,296.76228 L 227.93092,226.11942" 15.177 + id="path2919" 15.178 + inkscape:connector-type="polyline" 15.179 + inkscape:connection-start="#rect2830" /> 15.180 + <text 15.181 + xml:space="preserve" 15.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" 15.183 + x="295.28571" 15.184 + y="217.56711" 15.185 + id="text2871"><tspan 15.186 + sodipodi:role="line" 15.187 + id="tspan2873" 15.188 + x="295.28571" 15.189 + y="217.56711">tip (and head)</tspan></text> 15.190 + <text 15.191 + xml:space="preserve" 15.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" 15.193 + x="76" 15.194 + y="264.91769" 15.195 + id="text2875"><tspan 15.196 + sodipodi:role="line" 15.197 + id="tspan2877" 15.198 + x="76" 15.199 + y="264.91769" 15.200 + style="text-align:end;text-anchor:end">head</tspan></text> 15.201 + <rect 15.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" 15.203 + id="rect1913" 15.204 + width="94.285713" 15.205 + height="20.714285" 15.206 + x="138" 15.207 + y="156.90514" /> 15.208 + <path 15.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" 15.210 + d="M 144.22399,249.47657 L 179.49029,178.61943" 15.211 + id="path1915" 15.212 + inkscape:connector-type="polyline" 15.213 + inkscape:connection-start="#rect2863" 15.214 + inkscape:connection-end="#rect1913" /> 15.215 + <path 15.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" 15.217 + d="M 222.20966,203.40514 L 196.79033,178.61943" 15.218 + id="path1917" 15.219 + inkscape:connector-type="polyline" 15.220 + inkscape:connection-start="#rect2911" 15.221 + inkscape:connection-end="#rect1913" /> 15.222 + <text 15.223 + xml:space="preserve" 15.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" 15.225 + x="166.16823" 15.226 + y="168.52228" 15.227 + id="text2806"><tspan 15.228 + sodipodi:role="line" 15.229 + id="tspan2808" 15.230 + x="166.16823" 15.231 + y="168.52228" 15.232 + style="font-family:Courier">merge</tspan></text> 15.233 + <text 15.234 + xml:space="preserve" 15.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" 15.236 + x="246" 15.237 + y="162.63338" 15.238 + id="text2810"><tspan 15.239 + sodipodi:role="line" 15.240 + id="tspan2812" 15.241 + x="246" 15.242 + y="162.63338">working directory</tspan><tspan 15.243 + sodipodi:role="line" 15.244 + x="246" 15.245 + y="177.63338" 15.246 + id="tspan2814">during merge</tspan></text> 15.247 + <rect 15.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" 15.249 + id="rect2816" 15.250 + width="94.285713" 15.251 + height="20.714285" 15.252 + x="483.14636" 15.253 + y="297.76227" /> 15.254 + <text 15.255 + xml:space="preserve" 15.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" 15.257 + x="507.24527" 15.258 + y="311.38342" 15.259 + id="text2818"><tspan 15.260 + sodipodi:role="line" 15.261 + id="tspan2820" 15.262 + x="507.24527" 15.263 + y="311.38342" 15.264 + style="font-family:Courier"><tspan 15.265 + style="font-weight:bold" 15.266 + id="tspan2822">4</tspan>: REV4</tspan></text> 15.267 + <path 15.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" 15.269 + d="M 530.28921,343.6373 L 530.28921,319.47655" 15.270 + id="path2824" 15.271 + inkscape:connector-type="polyline" /> 15.272 + <rect 15.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" 15.274 + id="rect2826" 15.275 + width="94.285713" 15.276 + height="20.714285" 15.277 + x="436.57492" 15.278 + y="250.47656" /> 15.279 + <text 15.280 + xml:space="preserve" 15.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" 15.282 + x="461.24484" 15.283 + y="264.56613" 15.284 + id="text2828" 15.285 + transform="scale(1.000002,0.999998)"><tspan 15.286 + sodipodi:role="line" 15.287 + id="tspan2830" 15.288 + x="461.24484" 15.289 + y="264.56613" 15.290 + style="font-family:Courier"><tspan 15.291 + style="font-weight:bold" 15.292 + id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 15.293 + <path 15.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" 15.295 + d="M 519.10362,296.76227 L 494.90337,272.19084" 15.296 + id="path2834" 15.297 + inkscape:connector-type="polyline" /> 15.298 + <rect 15.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" 15.300 + id="rect2836" 15.301 + width="94.285995" 15.302 + height="20.714283" 15.303 + x="483.14001" 15.304 + y="156.548" /> 15.305 + <text 15.306 + xml:space="preserve" 15.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" 15.308 + x="555.95911" 15.309 + y="218.02698" 15.310 + id="text2838" 15.311 + transform="scale(1.000002,0.999998)"><tspan 15.312 + sodipodi:role="line" 15.313 + id="tspan2840" 15.314 + x="555.95911" 15.315 + y="218.02698" 15.316 + style="font-family:Courier"><tspan 15.317 + id="tspan2842" 15.318 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 15.319 + <path 15.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" 15.321 + d="M 536.21543,296.76227 L 574.03453,224.76218" 15.322 + id="path2844" 15.323 + inkscape:connector-type="polyline" /> 15.324 + <text 15.325 + xml:space="preserve" 15.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" 15.327 + x="594.43207" 15.328 + y="169.78796" 15.329 + id="text2846"><tspan 15.330 + sodipodi:role="line" 15.331 + id="tspan2848" 15.332 + x="594.43207" 15.333 + y="169.78796">tip</tspan></text> 15.334 + <path 15.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" 15.336 + d="M 489.37034,249.47656 L 524.65575,178.26229" 15.337 + id="path2856" 15.338 + inkscape:connector-type="polyline" 15.339 + inkscape:connection-end="#rect2836" /> 15.340 + <path 15.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" 15.342 + d="M 567.85714,202.0479 L 542.42591,178.26229" 15.343 + id="path2858" 15.344 + inkscape:connector-type="polyline" 15.345 + inkscape:connection-end="#rect2836" 15.346 + inkscape:connection-start="#rect2995" /> 15.347 + <text 15.348 + xml:space="preserve" 15.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" 15.350 + x="504.54507" 15.351 + y="170.39714" 15.352 + id="text2860"><tspan 15.353 + sodipodi:role="line" 15.354 + id="tspan2863" 15.355 + x="504.54507" 15.356 + y="170.39714" 15.357 + style="font-family:Courier"><tspan 15.358 + style="font-weight:bold" 15.359 + id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 15.360 + <text 15.361 + xml:space="preserve" 15.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" 15.363 + x="90.323105" 15.364 + y="120.21933" 15.365 + id="text2929"><tspan 15.366 + sodipodi:role="line" 15.367 + id="tspan2931" 15.368 + x="90.323105" 15.369 + y="120.21933" 15.370 + style="font-weight:bold">Working directory during merge</tspan></text> 15.371 + <text 15.372 + xml:space="preserve" 15.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" 15.374 + x="435.35226" 15.375 + y="120.21933" 15.376 + id="text2937"><tspan 15.377 + sodipodi:role="line" 15.378 + id="tspan2939" 15.379 + x="435.35226" 15.380 + y="120.21933" 15.381 + style="font-weight:bold">Repository after merge committed</tspan></text> 15.382 + </g> 15.383 +</svg>
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/en/figs/tour-merge-pull.svg Tue Mar 10 21:58:03 2009 -0700 16.3 @@ -0,0 +1,288 @@ 16.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 16.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 16.6 +<svg 16.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 16.8 + xmlns:cc="http://web.resource.org/cc/" 16.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 16.10 + xmlns:svg="http://www.w3.org/2000/svg" 16.11 + xmlns="http://www.w3.org/2000/svg" 16.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 16.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 16.14 + width="744.09448819" 16.15 + height="1052.3622047" 16.16 + id="svg2" 16.17 + sodipodi:version="0.32" 16.18 + inkscape:version="0.44.1" 16.19 + sodipodi:docname="tour-merge-pull.svg" 16.20 + sodipodi:docbase="/home/bos/hg/hgbook/en"> 16.21 + <defs 16.22 + id="defs4"> 16.23 + <marker 16.24 + inkscape:stockid="Arrow1Mstart" 16.25 + orient="auto" 16.26 + refY="0.0" 16.27 + refX="0.0" 16.28 + id="Arrow1Mstart" 16.29 + style="overflow:visible"> 16.30 + <path 16.31 + id="path2973" 16.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 " 16.33 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 16.34 + transform="scale(0.4) translate(10,0)" /> 16.35 + </marker> 16.36 + <marker 16.37 + inkscape:stockid="Arrow1Mend" 16.38 + orient="auto" 16.39 + refY="0.0" 16.40 + refX="0.0" 16.41 + id="Arrow1Mend" 16.42 + style="overflow:visible;"> 16.43 + <path 16.44 + id="path3066" 16.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 " 16.46 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 16.47 + transform="scale(0.4) rotate(180) translate(10,0)" /> 16.48 + </marker> 16.49 + </defs> 16.50 + <sodipodi:namedview 16.51 + id="base" 16.52 + pagecolor="#ffffff" 16.53 + bordercolor="#666666" 16.54 + borderopacity="1.0" 16.55 + gridtolerance="10000" 16.56 + guidetolerance="10" 16.57 + objecttolerance="10" 16.58 + inkscape:pageopacity="0.0" 16.59 + inkscape:pageshadow="2" 16.60 + inkscape:zoom="1.4" 16.61 + inkscape:cx="233.63208" 16.62 + inkscape:cy="832.54381" 16.63 + inkscape:document-units="px" 16.64 + inkscape:current-layer="layer1" 16.65 + inkscape:window-width="906" 16.66 + inkscape:window-height="620" 16.67 + inkscape:window-x="237" 16.68 + inkscape:window-y="103" /> 16.69 + <metadata 16.70 + id="metadata7"> 16.71 + <rdf:RDF> 16.72 + <cc:Work 16.73 + rdf:about=""> 16.74 + <dc:format>image/svg+xml</dc:format> 16.75 + <dc:type 16.76 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 16.77 + </cc:Work> 16.78 + </rdf:RDF> 16.79 + </metadata> 16.80 + <g 16.81 + inkscape:label="Layer 1" 16.82 + inkscape:groupmode="layer" 16.83 + id="layer1"> 16.84 + <text 16.85 + xml:space="preserve" 16.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" 16.87 + x="173.57143" 16.88 + y="443.79074" 16.89 + id="text2832"><tspan 16.90 + sodipodi:role="line" 16.91 + id="tspan2834" 16.92 + x="173.57143" 16.93 + y="443.79074" /></text> 16.94 + <rect 16.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" 16.96 + id="rect1878" 16.97 + width="94.285713" 16.98 + height="20.714285" 16.99 + x="138" 16.100 + y="479.50504" /> 16.101 + <text 16.102 + xml:space="preserve" 16.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" 16.104 + x="162.09892" 16.105 + y="493.12619" 16.106 + id="text1872"><tspan 16.107 + sodipodi:role="line" 16.108 + id="tspan1874" 16.109 + x="162.09892" 16.110 + y="493.12619" 16.111 + style="font-family:Courier"><tspan 16.112 + style="font-weight:bold" 16.113 + id="tspan1876">0</tspan>: REV0</tspan></text> 16.114 + <rect 16.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" 16.116 + id="rect2800" 16.117 + width="94.285713" 16.118 + height="20.714285" 16.119 + x="138" 16.120 + y="432.63004" /> 16.121 + <text 16.122 + xml:space="preserve" 16.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" 16.124 + x="162.09892" 16.125 + y="446.25119" 16.126 + id="text2794"><tspan 16.127 + sodipodi:role="line" 16.128 + id="tspan2796" 16.129 + x="162.09892" 16.130 + y="446.25119" 16.131 + style="font-family:Courier"><tspan 16.132 + id="tspan2868" 16.133 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 16.134 + <rect 16.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" 16.136 + id="rect2810" 16.137 + width="94.285713" 16.138 + height="20.714285" 16.139 + x="138" 16.140 + y="385.75504" /> 16.141 + <text 16.142 + xml:space="preserve" 16.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" 16.144 + x="162.09892" 16.145 + y="399.37619" 16.146 + id="text2804"><tspan 16.147 + sodipodi:role="line" 16.148 + id="tspan2806" 16.149 + x="162.09892" 16.150 + y="399.37619" 16.151 + style="font-family:Courier"><tspan 16.152 + style="font-weight:bold" 16.153 + id="tspan2866">2</tspan>: REV2</tspan></text> 16.154 + <rect 16.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" 16.156 + id="rect2820" 16.157 + width="94.285713" 16.158 + height="20.714285" 16.159 + x="138" 16.160 + y="338.88007" /> 16.161 + <text 16.162 + xml:space="preserve" 16.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" 16.164 + x="162.09892" 16.165 + y="352.50122" 16.166 + id="text2814"><tspan 16.167 + sodipodi:role="line" 16.168 + id="tspan2816" 16.169 + x="162.09892" 16.170 + y="352.50122" 16.171 + style="font-family:Courier"><tspan 16.172 + style="font-weight:bold" 16.173 + id="tspan2864">3</tspan>: REV3</tspan></text> 16.174 + <rect 16.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" 16.176 + id="rect2830" 16.177 + width="94.285713" 16.178 + height="20.714285" 16.179 + x="138" 16.180 + y="292.00504" /> 16.181 + <text 16.182 + xml:space="preserve" 16.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" 16.184 + x="162.09892" 16.185 + y="305.62619" 16.186 + id="text2824"><tspan 16.187 + sodipodi:role="line" 16.188 + id="tspan2826" 16.189 + x="162.09892" 16.190 + y="305.62619" 16.191 + style="font-family:Courier"><tspan 16.192 + style="font-weight:bold" 16.193 + id="tspan2862">4</tspan>: REV4</tspan></text> 16.194 + <path 16.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" 16.196 + d="M 185.14286,478.50504 L 185.14286,454.34432" 16.197 + id="path2894" 16.198 + inkscape:connector-type="polyline" /> 16.199 + <path 16.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" 16.201 + d="M 185.14286,431.63004 L 185.14286,407.46932" 16.202 + id="path2896" 16.203 + inkscape:connector-type="polyline" /> 16.204 + <path 16.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" 16.206 + d="M 185.14286,384.75504 L 185.14286,360.59435" 16.207 + id="path2898" 16.208 + inkscape:connector-type="polyline" /> 16.209 + <path 16.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" 16.211 + d="M 185.14286,337.88007 L 185.14286,313.71932" 16.212 + id="path2900" 16.213 + inkscape:connector-type="polyline" /> 16.214 + <rect 16.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" 16.216 + id="rect2863" 16.217 + width="94.285713" 16.218 + height="20.714285" 16.219 + x="91.428574" 16.220 + y="244.71933" /> 16.221 + <text 16.222 + xml:space="preserve" 16.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" 16.224 + x="116.09886" 16.225 + y="258.80865" 16.226 + id="text1965" 16.227 + transform="scale(1.000002,0.999998)"><tspan 16.228 + sodipodi:role="line" 16.229 + id="tspan1967" 16.230 + x="116.09886" 16.231 + y="258.80865" 16.232 + style="font-family:Courier"><tspan 16.233 + style="font-weight:bold" 16.234 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 16.235 + <path 16.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" 16.237 + d="M 173.95727,291.00504 L 149.75702,266.43361" 16.238 + id="path1971" 16.239 + inkscape:connector-type="polyline" 16.240 + inkscape:connection-end="#rect2863" 16.241 + inkscape:connection-start="#rect2830" /> 16.242 + <rect 16.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" 16.244 + id="rect2911" 16.245 + width="94.285995" 16.246 + height="20.714283" 16.247 + x="186.71414" 16.248 + y="198.6479" /> 16.249 + <text 16.250 + xml:space="preserve" 16.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" 16.252 + x="210.81311" 16.253 + y="212.26949" 16.254 + id="text2913" 16.255 + transform="scale(1.000002,0.999998)"><tspan 16.256 + sodipodi:role="line" 16.257 + id="tspan2915" 16.258 + x="210.81311" 16.259 + y="212.26949" 16.260 + style="font-family:Courier"><tspan 16.261 + id="tspan1966" 16.262 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 16.263 + <path 16.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" 16.265 + d="M 191.06908,291.00504 L 227.93092,220.36218" 16.266 + id="path2919" 16.267 + inkscape:connector-type="polyline" 16.268 + inkscape:connection-start="#rect2830" /> 16.269 + <text 16.270 + xml:space="preserve" 16.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" 16.272 + x="295.28571" 16.273 + y="211.80988" 16.274 + id="text2871"><tspan 16.275 + sodipodi:role="line" 16.276 + id="tspan2873" 16.277 + x="295.28571" 16.278 + y="211.80988">tip (and head)</tspan></text> 16.279 + <text 16.280 + xml:space="preserve" 16.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" 16.282 + x="76" 16.283 + y="259.16046" 16.284 + id="text2875"><tspan 16.285 + sodipodi:role="line" 16.286 + id="tspan2877" 16.287 + x="76" 16.288 + y="259.16046" 16.289 + style="text-align:end;text-anchor:end">head</tspan></text> 16.290 + </g> 16.291 +</svg>
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/en/figs/tour-merge-sep-repos.svg Tue Mar 10 21:58:03 2009 -0700 17.3 @@ -0,0 +1,466 @@ 17.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 17.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 17.6 +<svg 17.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 17.8 + xmlns:cc="http://web.resource.org/cc/" 17.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 17.10 + xmlns:svg="http://www.w3.org/2000/svg" 17.11 + xmlns="http://www.w3.org/2000/svg" 17.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 17.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 17.14 + width="744.09448819" 17.15 + height="1052.3622047" 17.16 + id="svg2" 17.17 + sodipodi:version="0.32" 17.18 + inkscape:version="0.44.1" 17.19 + sodipodi:docname="tour-merge-sep-repos.svg"> 17.20 + <defs 17.21 + id="defs4"> 17.22 + <marker 17.23 + inkscape:stockid="Arrow1Mstart" 17.24 + orient="auto" 17.25 + refY="0.0" 17.26 + refX="0.0" 17.27 + id="Arrow1Mstart" 17.28 + style="overflow:visible"> 17.29 + <path 17.30 + id="path2973" 17.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 " 17.32 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 17.33 + transform="scale(0.4) translate(10,0)" /> 17.34 + </marker> 17.35 + <marker 17.36 + inkscape:stockid="Arrow1Mend" 17.37 + orient="auto" 17.38 + refY="0.0" 17.39 + refX="0.0" 17.40 + id="Arrow1Mend" 17.41 + style="overflow:visible;"> 17.42 + <path 17.43 + id="path3066" 17.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 " 17.45 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 17.46 + transform="scale(0.4) rotate(180) translate(10,0)" /> 17.47 + </marker> 17.48 + </defs> 17.49 + <sodipodi:namedview 17.50 + id="base" 17.51 + pagecolor="#ffffff" 17.52 + bordercolor="#666666" 17.53 + borderopacity="1.0" 17.54 + gridtolerance="10000" 17.55 + guidetolerance="10" 17.56 + objecttolerance="10" 17.57 + inkscape:pageopacity="0.0" 17.58 + inkscape:pageshadow="2" 17.59 + inkscape:zoom="1.4" 17.60 + inkscape:cx="307.20351" 17.61 + inkscape:cy="716.87911" 17.62 + inkscape:document-units="px" 17.63 + inkscape:current-layer="layer1" 17.64 + inkscape:window-width="906" 17.65 + inkscape:window-height="620" 17.66 + inkscape:window-x="5" 17.67 + inkscape:window-y="49" /> 17.68 + <metadata 17.69 + id="metadata7"> 17.70 + <rdf:RDF> 17.71 + <cc:Work 17.72 + rdf:about=""> 17.73 + <dc:format>image/svg+xml</dc:format> 17.74 + <dc:type 17.75 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 17.76 + </cc:Work> 17.77 + </rdf:RDF> 17.78 + </metadata> 17.79 + <g 17.80 + inkscape:label="Layer 1" 17.81 + inkscape:groupmode="layer" 17.82 + id="layer1"> 17.83 + <text 17.84 + xml:space="preserve" 17.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" 17.86 + x="173.57143" 17.87 + y="443.79074" 17.88 + id="text2832"><tspan 17.89 + sodipodi:role="line" 17.90 + id="tspan2834" 17.91 + x="173.57143" 17.92 + y="443.79074" /></text> 17.93 + <rect 17.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" 17.95 + id="rect1878" 17.96 + width="94.285713" 17.97 + height="20.714285" 17.98 + x="138" 17.99 + y="479.50504" /> 17.100 + <text 17.101 + xml:space="preserve" 17.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" 17.103 + x="162.09892" 17.104 + y="493.12619" 17.105 + id="text1872"><tspan 17.106 + sodipodi:role="line" 17.107 + id="tspan1874" 17.108 + x="162.09892" 17.109 + y="493.12619" 17.110 + style="font-family:Courier"><tspan 17.111 + style="font-weight:bold" 17.112 + id="tspan1876">0</tspan>: REV0</tspan></text> 17.113 + <rect 17.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" 17.115 + id="rect2800" 17.116 + width="94.285713" 17.117 + height="20.714285" 17.118 + x="138" 17.119 + y="432.63004" /> 17.120 + <text 17.121 + xml:space="preserve" 17.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" 17.123 + x="162.09892" 17.124 + y="446.25119" 17.125 + id="text2794"><tspan 17.126 + sodipodi:role="line" 17.127 + id="tspan2796" 17.128 + x="162.09892" 17.129 + y="446.25119" 17.130 + style="font-family:Courier"><tspan 17.131 + id="tspan2868" 17.132 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 17.133 + <rect 17.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" 17.135 + id="rect2810" 17.136 + width="94.285713" 17.137 + height="20.714285" 17.138 + x="138" 17.139 + y="385.75504" /> 17.140 + <text 17.141 + xml:space="preserve" 17.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" 17.143 + x="162.09892" 17.144 + y="399.37619" 17.145 + id="text2804"><tspan 17.146 + sodipodi:role="line" 17.147 + id="tspan2806" 17.148 + x="162.09892" 17.149 + y="399.37619" 17.150 + style="font-family:Courier"><tspan 17.151 + style="font-weight:bold" 17.152 + id="tspan2866">2</tspan>: REV2</tspan></text> 17.153 + <rect 17.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" 17.155 + id="rect2820" 17.156 + width="94.285713" 17.157 + height="20.714285" 17.158 + x="138" 17.159 + y="338.88007" /> 17.160 + <text 17.161 + xml:space="preserve" 17.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" 17.163 + x="162.09892" 17.164 + y="352.50122" 17.165 + id="text2814"><tspan 17.166 + sodipodi:role="line" 17.167 + id="tspan2816" 17.168 + x="162.09892" 17.169 + y="352.50122" 17.170 + style="font-family:Courier"><tspan 17.171 + style="font-weight:bold" 17.172 + id="tspan2864">3</tspan>: REV3</tspan></text> 17.173 + <rect 17.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" 17.175 + id="rect2830" 17.176 + width="94.285713" 17.177 + height="20.714285" 17.178 + x="138" 17.179 + y="292.00504" /> 17.180 + <text 17.181 + xml:space="preserve" 17.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" 17.183 + x="162.09892" 17.184 + y="305.62619" 17.185 + id="text2824"><tspan 17.186 + sodipodi:role="line" 17.187 + id="tspan2826" 17.188 + x="162.09892" 17.189 + y="305.62619" 17.190 + style="font-family:Courier"><tspan 17.191 + style="font-weight:bold" 17.192 + id="tspan2862">4</tspan>: REV4</tspan></text> 17.193 + <path 17.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" 17.195 + d="M 185.14286,478.50504 L 185.14286,454.34432" 17.196 + id="path2894" 17.197 + inkscape:connector-type="polyline" /> 17.198 + <path 17.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" 17.200 + d="M 185.14286,431.63004 L 185.14286,407.46932" 17.201 + id="path2896" 17.202 + inkscape:connector-type="polyline" /> 17.203 + <path 17.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" 17.205 + d="M 185.14286,384.75504 L 185.14286,360.59435" 17.206 + id="path2898" 17.207 + inkscape:connector-type="polyline" /> 17.208 + <path 17.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" 17.210 + d="M 185.14286,337.88007 L 185.14286,313.71932" 17.211 + id="path2900" 17.212 + inkscape:connector-type="polyline" /> 17.213 + <rect 17.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" 17.215 + id="rect1963" 17.216 + width="94.285995" 17.217 + height="20.714283" 17.218 + x="138" 17.219 + y="245.18723" /> 17.220 + <text 17.221 + xml:space="preserve" 17.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" 17.223 + x="162.09877" 17.224 + y="258.80865" 17.225 + id="text1965" 17.226 + transform="scale(1.000002,0.999998)"><tspan 17.227 + sodipodi:role="line" 17.228 + id="tspan1967" 17.229 + x="162.09877" 17.230 + y="258.80865" 17.231 + style="font-family:Courier"><tspan 17.232 + style="font-weight:bold" 17.233 + id="tspan1973">5</tspan>: REV_my_hello</tspan></text> 17.234 + <path 17.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" 17.236 + d="M 185.143,291.06218 L 185.143,266.90143" 17.237 + id="path1971" 17.238 + inkscape:connector-type="polyline" /> 17.239 + <text 17.240 + xml:space="preserve" 17.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" 17.242 + x="136.90039" 17.243 + y="232.25546" 17.244 + id="text2921"><tspan 17.245 + sodipodi:role="line" 17.246 + id="tspan2923" 17.247 + x="136.90039" 17.248 + y="232.25546">my-hello</tspan></text> 17.249 + <rect 17.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" 17.251 + id="rect2863" 17.252 + width="94.285713" 17.253 + height="20.714285" 17.254 + x="370.71414" 17.255 + y="479.49289" /> 17.256 + <text 17.257 + xml:space="preserve" 17.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" 17.259 + x="394.81305" 17.260 + y="493.11404" 17.261 + id="text2865"><tspan 17.262 + sodipodi:role="line" 17.263 + id="tspan2867" 17.264 + x="394.81305" 17.265 + y="493.11404" 17.266 + style="font-family:Courier"><tspan 17.267 + style="font-weight:bold" 17.268 + id="tspan2869">0</tspan>: REV0</tspan></text> 17.269 + <rect 17.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" 17.271 + id="rect2871" 17.272 + width="94.285713" 17.273 + height="20.714285" 17.274 + x="370.71414" 17.275 + y="432.61789" /> 17.276 + <text 17.277 + xml:space="preserve" 17.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" 17.279 + x="394.81305" 17.280 + y="446.23904" 17.281 + id="text2873"><tspan 17.282 + sodipodi:role="line" 17.283 + id="tspan2875" 17.284 + x="394.81305" 17.285 + y="446.23904" 17.286 + style="font-family:Courier"><tspan 17.287 + id="tspan2877" 17.288 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 17.289 + <rect 17.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" 17.291 + id="rect2879" 17.292 + width="94.285713" 17.293 + height="20.714285" 17.294 + x="370.71414" 17.295 + y="385.74289" /> 17.296 + <text 17.297 + xml:space="preserve" 17.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" 17.299 + x="394.81305" 17.300 + y="399.36404" 17.301 + id="text2881"><tspan 17.302 + sodipodi:role="line" 17.303 + id="tspan2883" 17.304 + x="394.81305" 17.305 + y="399.36404" 17.306 + style="font-family:Courier"><tspan 17.307 + style="font-weight:bold" 17.308 + id="tspan2885">2</tspan>: REV2</tspan></text> 17.309 + <rect 17.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" 17.311 + id="rect2887" 17.312 + width="94.285713" 17.313 + height="20.714285" 17.314 + x="370.71414" 17.315 + y="338.86792" /> 17.316 + <text 17.317 + xml:space="preserve" 17.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" 17.319 + x="394.81305" 17.320 + y="352.48907" 17.321 + id="text2889"><tspan 17.322 + sodipodi:role="line" 17.323 + id="tspan2891" 17.324 + x="394.81305" 17.325 + y="352.48907" 17.326 + style="font-family:Courier"><tspan 17.327 + style="font-weight:bold" 17.328 + id="tspan2893">3</tspan>: REV3</tspan></text> 17.329 + <rect 17.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" 17.331 + id="rect2895" 17.332 + width="94.285713" 17.333 + height="20.714285" 17.334 + x="370.71414" 17.335 + y="291.99289" /> 17.336 + <text 17.337 + xml:space="preserve" 17.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" 17.339 + x="394.81305" 17.340 + y="305.61404" 17.341 + id="text2897"><tspan 17.342 + sodipodi:role="line" 17.343 + id="tspan2899" 17.344 + x="394.81305" 17.345 + y="305.61404" 17.346 + style="font-family:Courier"><tspan 17.347 + style="font-weight:bold" 17.348 + id="tspan2901">4</tspan>: REV4</tspan></text> 17.349 + <path 17.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" 17.351 + d="M 417.85701,478.4929 L 417.85701,454.33218" 17.352 + id="path2903" 17.353 + inkscape:connector-type="polyline" /> 17.354 + <path 17.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" 17.356 + d="M 417.85701,431.6179 L 417.85701,407.45718" 17.357 + id="path2905" 17.358 + inkscape:connector-type="polyline" /> 17.359 + <path 17.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" 17.361 + d="M 417.85701,384.7429 L 417.85701,360.58221" 17.362 + id="path2907" 17.363 + inkscape:connector-type="polyline" /> 17.364 + <path 17.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" 17.366 + d="M 417.85701,337.86793 L 417.85701,313.70718" 17.367 + id="path2909" 17.368 + inkscape:connector-type="polyline" /> 17.369 + <rect 17.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" 17.371 + id="rect2911" 17.372 + width="94.285995" 17.373 + height="20.714283" 17.374 + x="370.71414" 17.375 + y="245.17511" /> 17.376 + <text 17.377 + xml:space="preserve" 17.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" 17.379 + x="394.81274" 17.380 + y="258.79678" 17.381 + id="text2913" 17.382 + transform="scale(1.000002,0.999998)"><tspan 17.383 + sodipodi:role="line" 17.384 + id="tspan2915" 17.385 + x="394.81274" 17.386 + y="258.79678" 17.387 + style="font-family:Courier"><tspan 17.388 + style="font-weight:bold" 17.389 + id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text> 17.390 + <path 17.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" 17.392 + d="M 417.85715,291.05004 L 417.85715,266.88929" 17.393 + id="path2919" 17.394 + inkscape:connector-type="polyline" /> 17.395 + <text 17.396 + xml:space="preserve" 17.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" 17.398 + x="369.61453" 17.399 + y="232.25546" 17.400 + id="text2925"><tspan 17.401 + sodipodi:role="line" 17.402 + id="tspan2927" 17.403 + x="369.61453" 17.404 + y="232.25546">my-new-hello</tspan></text> 17.405 + <text 17.406 + xml:space="preserve" 17.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" 17.408 + x="300.54352" 17.409 + y="252.12723" 17.410 + id="text2933"><tspan 17.411 + sodipodi:role="line" 17.412 + id="tspan2935" 17.413 + x="300.54352" 17.414 + y="252.12723" 17.415 + style="text-align:center;text-anchor:middle">newest changes</tspan><tspan 17.416 + sodipodi:role="line" 17.417 + x="300.54352" 17.418 + y="267.12723" 17.419 + style="text-align:center;text-anchor:middle" 17.420 + id="tspan3132">differ</tspan></text> 17.421 + <text 17.422 + xml:space="preserve" 17.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" 17.424 + x="262.15436" 17.425 + y="398.37112" 17.426 + id="text2929"><tspan 17.427 + sodipodi:role="line" 17.428 + x="262.15436" 17.429 + y="398.37112" 17.430 + id="tspan3013" 17.431 + style="text-align:start;text-anchor:start">common history</tspan></text> 17.432 + <g 17.433 + id="g3107" 17.434 + transform="translate(0,0.855744)"> 17.435 + <path 17.436 + id="path3101" 17.437 + d="M 300.35713,381.29075 L 300.35713,304.50504" 17.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" /> 17.439 + <path 17.440 + id="path3105" 17.441 + d="M 291.07142,301.64789 L 309.28571,301.64789" 17.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" /> 17.443 + </g> 17.444 + <path 17.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" 17.446 + d="M 300.53571,486.38926 L 300.53571,409.60355" 17.447 + id="path3113" /> 17.448 + <path 17.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" 17.450 + d="M 291.25,488.49641 L 309.46429,488.49641" 17.451 + id="path3115" /> 17.452 + <text 17.453 + xml:space="preserve" 17.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" 17.455 + x="480.71429" 17.456 + y="250.91507" 17.457 + id="text1949"><tspan 17.458 + sodipodi:role="line" 17.459 + id="tspan1951" 17.460 + x="480.71429" 17.461 + y="250.91507" 17.462 + style="text-align:start;text-anchor:start">head revision</tspan><tspan 17.463 + sodipodi:role="line" 17.464 + x="480.71429" 17.465 + y="265.91507" 17.466 + id="tspan1953" 17.467 + style="text-align:start;text-anchor:start">(has no children)</tspan></text> 17.468 + </g> 17.469 +</svg>
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/en/figs/undo-manual-merge.dot Tue Mar 10 21:58:03 2009 -0700 18.3 @@ -0,0 +1,8 @@ 18.4 +digraph undo_manual { 18.5 + "first change" -> "second change"; 18.6 + "second change" -> "third change"; 18.7 + backout [label="back out\nsecond change", shape=box]; 18.8 + "second change" -> backout; 18.9 + "third change" -> "manual\nmerge"; 18.10 + backout -> "manual\nmerge"; 18.11 +}
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/en/figs/undo-manual.dot Tue Mar 10 21:58:03 2009 -0700 19.3 @@ -0,0 +1,6 @@ 19.4 +digraph undo_manual { 19.5 + "first change" -> "second change"; 19.6 + "second change" -> "third change"; 19.7 + backout [label="back out\nsecond change", shape=box]; 19.8 + "second change" -> backout; 19.9 +}
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/en/figs/undo-non-tip.dot Tue Mar 10 21:58:03 2009 -0700 20.3 @@ -0,0 +1,9 @@ 20.4 +digraph undo_non_tip { 20.5 + "first change" -> "second change"; 20.6 + "second change" -> "third change"; 20.7 + backout [label="back out\nsecond change", shape=box]; 20.8 + "second change" -> backout; 20.9 + merge [label="automated\nmerge", shape=box]; 20.10 + "third change" -> merge; 20.11 + backout -> merge; 20.12 +}
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/en/figs/undo-simple.dot Tue Mar 10 21:58:03 2009 -0700 21.3 @@ -0,0 +1,4 @@ 21.4 +digraph undo_simple { 21.5 + "first change" -> "second change"; 21.6 + "second change" -> "back out\nsecond change"; 21.7 +}
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/en/figs/wdir-after-commit.svg Tue Mar 10 21:58:03 2009 -0700 22.3 @@ -0,0 +1,394 @@ 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-after-commit.svg"> 22.22 + <defs 22.23 + id="defs5973"> 22.24 + <linearGradient 22.25 + inkscape:collect="always" 22.26 + xlink:href="#linearGradient6049" 22.27 + id="linearGradient6445" 22.28 + gradientUnits="userSpaceOnUse" 22.29 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 22.30 + x1="333.91171" 22.31 + y1="488.79077" 22.32 + x2="508.94543" 22.33 + y2="263.79077" /> 22.34 + <marker 22.35 + inkscape:stockid="Arrow1Mstart" 22.36 + orient="auto" 22.37 + refY="0.0" 22.38 + refX="0.0" 22.39 + id="Arrow1Mstart" 22.40 + style="overflow:visible"> 22.41 + <path 22.42 + id="path4855" 22.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 " 22.44 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 22.45 + transform="scale(0.4) translate(10,0)" /> 22.46 + </marker> 22.47 + <linearGradient 22.48 + id="linearGradient6049"> 22.49 + <stop 22.50 + style="stop-color:#686868;stop-opacity:1;" 22.51 + offset="0" 22.52 + id="stop6051" /> 22.53 + <stop 22.54 + style="stop-color:#f0f0f0;stop-opacity:1;" 22.55 + offset="1" 22.56 + id="stop6053" /> 22.57 + </linearGradient> 22.58 + <marker 22.59 + inkscape:stockid="Arrow1Mend" 22.60 + orient="auto" 22.61 + refY="0.0" 22.62 + refX="0.0" 22.63 + id="Arrow1Mend" 22.64 + style="overflow:visible;"> 22.65 + <path 22.66 + id="path4852" 22.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 " 22.68 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 22.69 + transform="scale(0.4) rotate(180) translate(10,0)" /> 22.70 + </marker> 22.71 + <linearGradient 22.72 + inkscape:collect="always" 22.73 + xlink:href="#linearGradient6049" 22.74 + id="linearGradient6083" 22.75 + gradientUnits="userSpaceOnUse" 22.76 + gradientTransform="translate(-240.0462,-8.633237e-6)" 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="linearGradient6142" 22.85 + gradientUnits="userSpaceOnUse" 22.86 + gradientTransform="translate(-42.00893,-30.49544)" 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="linearGradient6193" 22.95 + gradientUnits="userSpaceOnUse" 22.96 + gradientTransform="translate(-240.0462,-8.633237e-6)" 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="linearGradient6216" 22.105 + gradientUnits="userSpaceOnUse" 22.106 + gradientTransform="translate(-6.0462,-0.664361)" 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="linearGradient6232" 22.115 + gradientUnits="userSpaceOnUse" 22.116 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 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="linearGradient6772" 22.125 + gradientUnits="userSpaceOnUse" 22.126 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 22.127 + x1="333.91171" 22.128 + y1="488.79077" 22.129 + x2="508.94543" 22.130 + y2="263.79077" /> 22.131 + </defs> 22.132 + <sodipodi:namedview 22.133 + id="base" 22.134 + pagecolor="#ffffff" 22.135 + bordercolor="#666666" 22.136 + borderopacity="1.0" 22.137 + gridtolerance="10000" 22.138 + guidetolerance="10" 22.139 + objecttolerance="10" 22.140 + inkscape:pageopacity="0.0" 22.141 + inkscape:pageshadow="2" 22.142 + inkscape:zoom="0.90509668" 22.143 + inkscape:cx="390.0539" 22.144 + inkscape:cy="690.49342" 22.145 + inkscape:document-units="px" 22.146 + inkscape:current-layer="layer1" 22.147 + showguides="true" 22.148 + inkscape:guide-bbox="true" 22.149 + inkscape:window-width="906" 22.150 + inkscape:window-height="620" 22.151 + inkscape:window-x="0" 22.152 + inkscape:window-y="25"> 22.153 + <sodipodi:guide 22.154 + orientation="vertical" 22.155 + position="-1.4285714" 22.156 + id="guide6022" /> 22.157 + </sodipodi:namedview> 22.158 + <metadata 22.159 + id="metadata5976"> 22.160 + <rdf:RDF> 22.161 + <cc:Work 22.162 + rdf:about=""> 22.163 + <dc:format>image/svg+xml</dc:format> 22.164 + <dc:type 22.165 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 22.166 + </cc:Work> 22.167 + </rdf:RDF> 22.168 + </metadata> 22.169 + <g 22.170 + inkscape:label="Layer 1" 22.171 + inkscape:groupmode="layer" 22.172 + id="layer1"> 22.173 + <rect 22.174 + y="245.98355" 22.175 + x="328.23956" 22.176 + height="258.57144" 22.177 + width="174.28572" 22.178 + id="rect6047" 22.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" /> 22.180 + <g 22.181 + id="g6261" 22.182 + transform="translate(234,0)"> 22.183 + <rect 22.184 + y="258.7149" 22.185 + x="114.11369" 22.186 + height="44.537449" 22.187 + width="134.53746" 22.188 + id="rect5983" 22.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" /> 22.190 + <text 22.191 + id="text5985" 22.192 + y="284.47562" 22.193 + x="138.7962" 22.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" 22.195 + xml:space="preserve"><tspan 22.196 + style="font-family:Courier" 22.197 + y="284.47562" 22.198 + x="138.7962" 22.199 + id="tspan5987" 22.200 + sodipodi:role="line">dfbbb33f3fa3</tspan></text> 22.201 + </g> 22.202 + <rect 22.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" 22.204 + id="rect5996" 22.205 + width="134.53746" 22.206 + height="44.537449" 22.207 + x="348.11371" 22.208 + y="320.38159" /> 22.209 + <text 22.210 + xml:space="preserve" 22.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" 22.212 + x="372.7962" 22.213 + y="346.1423" 22.214 + id="text5998"><tspan 22.215 + sodipodi:role="line" 22.216 + id="tspan6000" 22.217 + x="372.7962" 22.218 + y="346.1423" 22.219 + style="font-family:Courier">e7639888bb2f</tspan></text> 22.220 + <rect 22.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" 22.222 + id="rect6004" 22.223 + width="134.53746" 22.224 + height="44.537449" 22.225 + x="348.11371" 22.226 + y="382.04825" /> 22.227 + <text 22.228 + xml:space="preserve" 22.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" 22.230 + x="370.65421" 22.231 + y="407.80896" 22.232 + id="text6006"><tspan 22.233 + sodipodi:role="line" 22.234 + id="tspan6008" 22.235 + x="370.65421" 22.236 + y="407.80896" 22.237 + style="font-family:Courier">7b064d8bac5e</tspan></text> 22.238 + <path 22.239 + inkscape:connector-type="polyline" 22.240 + id="path6018" 22.241 + d="M 415.38242,303.62646 L 415.38242,320.00744" 22.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" /> 22.243 + <path 22.244 + inkscape:connection-end="#rect6004" 22.245 + inkscape:connector-type="polyline" 22.246 + id="path6020" 22.247 + d="M 415.38242,365.29315 L 415.38243,381.67412" 22.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" /> 22.249 + <rect 22.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" 22.251 + id="rect6039" 22.252 + width="134.53746" 22.253 + height="44.537449" 22.254 + x="348.11359" 22.255 + y="443.71487" /> 22.256 + <text 22.257 + xml:space="preserve" 22.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" 22.259 + x="372.79706" 22.260 + y="469.47556" 22.261 + id="text6041"><tspan 22.262 + sodipodi:role="line" 22.263 + id="tspan6043" 22.264 + x="372.79706" 22.265 + y="469.47556" 22.266 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 22.267 + <path 22.268 + inkscape:connection-end="#rect6039" 22.269 + inkscape:connector-type="polyline" 22.270 + id="path6045" 22.271 + d="M 415.38238,426.95981 L 415.38235,443.34087" 22.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" /> 22.273 + <text 22.274 + xml:space="preserve" 22.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" 22.276 + x="327.66046" 22.277 + y="231.36218" 22.278 + id="text6102"><tspan 22.279 + sodipodi:role="line" 22.280 + id="tspan6104" 22.281 + x="327.66046" 22.282 + y="231.36218">History in repository</tspan></text> 22.283 + <rect 22.284 + y="245.94225" 22.285 + x="557.28418" 22.286 + height="204.51619" 22.287 + width="174.36833" 22.288 + id="rect6140" 22.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" /> 22.290 + <g 22.291 + id="g6130" 22.292 + transform="translate(262.3254,24.38544)"> 22.293 + <rect 22.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" 22.295 + id="rect6106" 22.296 + width="134.53746" 22.297 + height="44.537449" 22.298 + x="314.87415" 22.299 + y="257.95059" /> 22.300 + <text 22.301 + xml:space="preserve" 22.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" 22.303 + x="339.55664" 22.304 + y="283.7113" 22.305 + id="text6108"><tspan 22.306 + sodipodi:role="line" 22.307 + id="tspan6110" 22.308 + x="339.55664" 22.309 + y="283.7113" 22.310 + style="font-family:Courier">dfbbb33f3fa3</tspan></text> 22.311 + </g> 22.312 + <g 22.313 + id="g6135" 22.314 + transform="translate(263.0396,49.83106)"> 22.315 + <rect 22.316 + inkscape:transform-center-y="102.85714" 22.317 + inkscape:transform-center-x="129.28571" 22.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" 22.319 + id="rect6112" 22.320 + width="134.53746" 22.321 + height="44.537449" 22.322 + x="314.15985" 22.323 + y="326.52203" /> 22.324 + <text 22.325 + inkscape:transform-center-y="102.7311" 22.326 + inkscape:transform-center-x="128.69672" 22.327 + xml:space="preserve" 22.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" 22.329 + x="338.84335" 22.330 + y="352.28271" 22.331 + id="text6114"><tspan 22.332 + sodipodi:role="line" 22.333 + id="tspan6116" 22.334 + x="338.84335" 22.335 + y="352.28271" 22.336 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 22.337 + </g> 22.338 + <text 22.339 + xml:space="preserve" 22.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" 22.341 + x="576.63208" 22.342 + y="270.479" 22.343 + id="text6118"><tspan 22.344 + sodipodi:role="line" 22.345 + id="tspan6120" 22.346 + x="576.63208" 22.347 + y="270.479">First parent</tspan></text> 22.348 + <text 22.349 + xml:space="preserve" 22.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" 22.351 + x="576.07544" 22.352 + y="364.49615" 22.353 + id="text6122"><tspan 22.354 + sodipodi:role="line" 22.355 + id="tspan6124" 22.356 + x="576.07544" 22.357 + y="364.49615">Second parent</tspan></text> 22.358 + <text 22.359 + xml:space="preserve" 22.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" 22.361 + x="556.61743" 22.362 + y="231.36218" 22.363 + id="text6195"><tspan 22.364 + sodipodi:role="line" 22.365 + id="tspan6197" 22.366 + x="556.61743" 22.367 + y="231.36218">Parents of working directory</tspan></text> 22.368 + <path 22.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" 22.370 + d="M 576.82542,297.63008 L 483.02528,287.95831" 22.371 + id="path6266" 22.372 + inkscape:connector-type="polyline" 22.373 + inkscape:connection-start="#g6130" 22.374 + inkscape:connection-end="#g6261" /> 22.375 + <path 22.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" 22.377 + d="M 665.12232,418.17579 L 665.12232,418.17579" 22.378 + id="path6270" 22.379 + inkscape:connector-type="polyline" /> 22.380 + <text 22.381 + xml:space="preserve" 22.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" 22.383 + x="316.86407" 22.384 + y="275.6496" 22.385 + id="text6573"><tspan 22.386 + sodipodi:role="line" 22.387 + id="tspan6575" 22.388 + x="316.86407" 22.389 + y="275.6496" 22.390 + style="text-align:end;text-anchor:end">New</tspan><tspan 22.391 + sodipodi:role="line" 22.392 + x="316.86407" 22.393 + y="290.6496" 22.394 + id="tspan6577" 22.395 + style="text-align:end;text-anchor:end">changeset</tspan></text> 22.396 + </g> 22.397 +</svg>
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/en/figs/wdir-branch.svg Tue Mar 10 21:58:03 2009 -0700 23.3 @@ -0,0 +1,418 @@ 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-branch.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 + <linearGradient 23.122 + inkscape:collect="always" 23.123 + xlink:href="#linearGradient6049" 23.124 + id="linearGradient6974" 23.125 + gradientUnits="userSpaceOnUse" 23.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 23.127 + x1="333.91171" 23.128 + y1="488.79077" 23.129 + x2="508.94543" 23.130 + y2="263.79077" /> 23.131 + <linearGradient 23.132 + inkscape:collect="always" 23.133 + xlink:href="#linearGradient6049" 23.134 + id="linearGradient6996" 23.135 + gradientUnits="userSpaceOnUse" 23.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 23.137 + x1="333.91171" 23.138 + y1="488.79077" 23.139 + x2="508.94543" 23.140 + y2="263.79077" /> 23.141 + </defs> 23.142 + <sodipodi:namedview 23.143 + id="base" 23.144 + pagecolor="#ffffff" 23.145 + bordercolor="#666666" 23.146 + borderopacity="1.0" 23.147 + gridtolerance="10000" 23.148 + guidetolerance="10" 23.149 + objecttolerance="10" 23.150 + inkscape:pageopacity="0.0" 23.151 + inkscape:pageshadow="2" 23.152 + inkscape:zoom="0.90509668" 23.153 + inkscape:cx="345.85973" 23.154 + inkscape:cy="690.49342" 23.155 + inkscape:document-units="px" 23.156 + inkscape:current-layer="layer1" 23.157 + showguides="true" 23.158 + inkscape:guide-bbox="true" 23.159 + inkscape:window-width="906" 23.160 + inkscape:window-height="620" 23.161 + inkscape:window-x="0" 23.162 + inkscape:window-y="25"> 23.163 + <sodipodi:guide 23.164 + orientation="vertical" 23.165 + position="-1.4285714" 23.166 + id="guide6022" /> 23.167 + </sodipodi:namedview> 23.168 + <metadata 23.169 + id="metadata5976"> 23.170 + <rdf:RDF> 23.171 + <cc:Work 23.172 + rdf:about=""> 23.173 + <dc:format>image/svg+xml</dc:format> 23.174 + <dc:type 23.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 23.176 + </cc:Work> 23.177 + </rdf:RDF> 23.178 + </metadata> 23.179 + <g 23.180 + inkscape:label="Layer 1" 23.181 + inkscape:groupmode="layer" 23.182 + id="layer1"> 23.183 + <rect 23.184 + y="246.06918" 23.185 + x="64.325172" 23.186 + height="204.26233" 23.187 + width="333.2135" 23.188 + id="rect6047" 23.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" /> 23.190 + <g 23.191 + id="g1935"> 23.192 + <rect 23.193 + y="266.24374" 23.194 + x="84.113708" 23.195 + height="44.537449" 23.196 + width="134.53746" 23.197 + id="rect5996" 23.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" /> 23.199 + <text 23.200 + id="text5998" 23.201 + y="292.00446" 23.202 + x="108.7962" 23.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" 23.204 + xml:space="preserve"><tspan 23.205 + style="font-family:Courier" 23.206 + y="292.00446" 23.207 + x="108.7962" 23.208 + id="tspan6000" 23.209 + sodipodi:role="line">e7639888bb2f</tspan></text> 23.210 + </g> 23.211 + <g 23.212 + id="g6976" 23.213 + transform="translate(70,0)"> 23.214 + <rect 23.215 + y="327.9104" 23.216 + x="40.113693" 23.217 + height="44.537449" 23.218 + width="134.53746" 23.219 + id="rect6004" 23.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" /> 23.221 + <text 23.222 + id="text6006" 23.223 + y="353.67111" 23.224 + x="62.654205" 23.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" 23.226 + xml:space="preserve"><tspan 23.227 + style="font-family:Courier" 23.228 + y="353.67111" 23.229 + x="62.654205" 23.230 + id="tspan6008" 23.231 + sodipodi:role="line">7b064d8bac5e</tspan></text> 23.232 + </g> 23.233 + <path 23.234 + inkscape:connector-type="polyline" 23.235 + id="path6020" 23.236 + d="M 160.92915,311.15532 L 167.83571,327.53627" 23.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" 23.238 + inkscape:connection-end="#g6976" 23.239 + inkscape:connection-start="#g1935" /> 23.240 + <rect 23.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" 23.242 + id="rect6039" 23.243 + width="134.53746" 23.244 + height="44.537449" 23.245 + x="110.11359" 23.246 + y="389.57703" /> 23.247 + <text 23.248 + xml:space="preserve" 23.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" 23.250 + x="134.79706" 23.251 + y="415.33771" 23.252 + id="text6041"><tspan 23.253 + sodipodi:role="line" 23.254 + id="tspan6043" 23.255 + x="134.79706" 23.256 + y="415.33771" 23.257 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 23.258 + <path 23.259 + inkscape:connection-end="#rect6039" 23.260 + inkscape:connector-type="polyline" 23.261 + id="path6045" 23.262 + d="M 177.38238,372.82195 L 177.38235,389.20303" 23.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" /> 23.264 + <rect 23.265 + y="245.94225" 23.266 + x="447.28412" 23.267 + height="204.51619" 23.268 + width="174.36833" 23.269 + id="rect6140" 23.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" /> 23.271 + <g 23.272 + id="g6130" 23.273 + transform="translate(152.3254,24.38544)"> 23.274 + <rect 23.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" 23.276 + id="rect6106" 23.277 + width="134.53746" 23.278 + height="44.537449" 23.279 + x="314.87415" 23.280 + y="257.95059" /> 23.281 + <text 23.282 + xml:space="preserve" 23.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" 23.284 + x="339.55664" 23.285 + y="283.7113" 23.286 + id="text6108"><tspan 23.287 + sodipodi:role="line" 23.288 + id="tspan6110" 23.289 + x="339.55664" 23.290 + y="283.7113" 23.291 + style="font-family:Courier">ffb20e1701ea</tspan></text> 23.292 + </g> 23.293 + <g 23.294 + id="g6135" 23.295 + transform="translate(153.0396,49.83106)"> 23.296 + <rect 23.297 + inkscape:transform-center-y="102.85714" 23.298 + inkscape:transform-center-x="129.28571" 23.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" 23.300 + id="rect6112" 23.301 + width="134.53746" 23.302 + height="44.537449" 23.303 + x="314.15985" 23.304 + y="326.52203" /> 23.305 + <text 23.306 + inkscape:transform-center-y="102.7311" 23.307 + inkscape:transform-center-x="128.69672" 23.308 + xml:space="preserve" 23.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" 23.310 + x="338.84335" 23.311 + y="352.28271" 23.312 + id="text6114"><tspan 23.313 + sodipodi:role="line" 23.314 + id="tspan6116" 23.315 + x="338.84335" 23.316 + y="352.28271" 23.317 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 23.318 + </g> 23.319 + <text 23.320 + xml:space="preserve" 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 + x="466.63208" 23.323 + y="270.479" 23.324 + id="text6118"><tspan 23.325 + sodipodi:role="line" 23.326 + id="tspan6120" 23.327 + x="466.63208" 23.328 + y="270.479">First parent</tspan></text> 23.329 + <text 23.330 + xml:space="preserve" 23.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" 23.332 + x="466.07544" 23.333 + y="364.49615" 23.334 + id="text6122"><tspan 23.335 + sodipodi:role="line" 23.336 + id="tspan6124" 23.337 + x="466.07544" 23.338 + y="364.49615">Second parent</tspan></text> 23.339 + <text 23.340 + xml:space="preserve" 23.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" 23.342 + x="446.61743" 23.343 + y="231.36218" 23.344 + id="text6195"><tspan 23.345 + sodipodi:role="line" 23.346 + id="tspan6197" 23.347 + x="446.61743" 23.348 + y="231.36218">Parents of working directory</tspan></text> 23.349 + <path 23.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" 23.351 + d="M 466.82542,300.21999 L 377.00207,294.39744" 23.352 + id="path6266" 23.353 + inkscape:connector-type="polyline" 23.354 + inkscape:connection-start="#g6130" 23.355 + inkscape:connection-end="#rect1925" /> 23.356 + <path 23.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" 23.358 + d="M 665.12232,418.17579 L 665.12232,418.17579" 23.359 + id="path6270" 23.360 + inkscape:connector-type="polyline" /> 23.361 + <g 23.362 + id="g2845"> 23.363 + <rect 23.364 + y="266.24374" 23.365 + x="242.09048" 23.366 + height="44.537449" 23.367 + width="134.53746" 23.368 + id="rect1925" 23.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" /> 23.370 + <text 23.371 + id="text1927" 23.372 + y="292.00446" 23.373 + x="266.77298" 23.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" 23.375 + xml:space="preserve"><tspan 23.376 + style="font-family:Courier" 23.377 + y="292.00446" 23.378 + x="266.77298" 23.379 + id="tspan1929" 23.380 + sodipodi:role="line">ffb20e1701ea</tspan></text> 23.381 + </g> 23.382 + <path 23.383 + inkscape:connector-type="polyline" 23.384 + id="path1933" 23.385 + d="M 260.89978,311.15532 L 225.84185,327.53627" 23.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" 23.387 + inkscape:connection-end="#g6976" /> 23.388 + <text 23.389 + xml:space="preserve" 23.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" 23.391 + x="109.45568" 23.392 + y="231.4554" 23.393 + id="text2837"><tspan 23.394 + sodipodi:role="line" 23.395 + id="tspan2839" 23.396 + x="109.45568" 23.397 + y="231.4554">Pre-existing head</tspan></text> 23.398 + <text 23.399 + xml:space="preserve" 23.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" 23.401 + x="237.54184" 23.402 + y="231.4554" 23.403 + id="text2841"><tspan 23.404 + sodipodi:role="line" 23.405 + id="tspan2843" 23.406 + x="237.54184" 23.407 + y="231.4554">Newly created head (and tip)</tspan></text> 23.408 + <path 23.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)" 23.410 + d="M 148.05048,235.87482 L 149.94915,265.86962" 23.411 + id="path2850" 23.412 + inkscape:connector-type="polyline" 23.413 + inkscape:connection-end="#g1935" /> 23.414 + <path 23.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)" 23.416 + d="M 303.83495,238.08453 L 306.87874,265.86962" 23.417 + id="path2852" 23.418 + inkscape:connector-type="polyline" 23.419 + inkscape:connection-end="#g2845" /> 23.420 + </g> 23.421 +</svg>
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/en/figs/wdir-merge.svg Tue Mar 10 21:58:03 2009 -0700 24.3 @@ -0,0 +1,425 @@ 24.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 24.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 24.6 +<svg 24.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 24.8 + xmlns:cc="http://web.resource.org/cc/" 24.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 24.10 + xmlns:svg="http://www.w3.org/2000/svg" 24.11 + xmlns="http://www.w3.org/2000/svg" 24.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 24.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 24.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 24.15 + width="744.09448819" 24.16 + height="1052.3622047" 24.17 + id="svg5971" 24.18 + sodipodi:version="0.32" 24.19 + inkscape:version="0.44.1" 24.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 24.21 + sodipodi:docname="wdir-merge.svg"> 24.22 + <defs 24.23 + id="defs5973"> 24.24 + <marker 24.25 + inkscape:stockid="Arrow1Mstart" 24.26 + orient="auto" 24.27 + refY="0.0" 24.28 + refX="0.0" 24.29 + id="Arrow1Mstart" 24.30 + style="overflow:visible"> 24.31 + <path 24.32 + id="path4855" 24.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 " 24.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 24.35 + transform="scale(0.4) translate(10,0)" /> 24.36 + </marker> 24.37 + <linearGradient 24.38 + id="linearGradient6049"> 24.39 + <stop 24.40 + style="stop-color:#686868;stop-opacity:1;" 24.41 + offset="0" 24.42 + id="stop6051" /> 24.43 + <stop 24.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 24.45 + offset="1" 24.46 + id="stop6053" /> 24.47 + </linearGradient> 24.48 + <marker 24.49 + inkscape:stockid="Arrow1Mend" 24.50 + orient="auto" 24.51 + refY="0.0" 24.52 + refX="0.0" 24.53 + id="Arrow1Mend" 24.54 + style="overflow:visible;"> 24.55 + <path 24.56 + id="path4852" 24.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 " 24.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 24.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 24.60 + </marker> 24.61 + <linearGradient 24.62 + inkscape:collect="always" 24.63 + xlink:href="#linearGradient6049" 24.64 + id="linearGradient6083" 24.65 + gradientUnits="userSpaceOnUse" 24.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 24.67 + x1="333.91171" 24.68 + y1="488.79077" 24.69 + x2="508.94543" 24.70 + y2="263.79077" /> 24.71 + <linearGradient 24.72 + inkscape:collect="always" 24.73 + xlink:href="#linearGradient6049" 24.74 + id="linearGradient6142" 24.75 + gradientUnits="userSpaceOnUse" 24.76 + gradientTransform="translate(-42.00893,-30.49544)" 24.77 + x1="333.91171" 24.78 + y1="488.79077" 24.79 + x2="508.94543" 24.80 + y2="263.79077" /> 24.81 + <linearGradient 24.82 + inkscape:collect="always" 24.83 + xlink:href="#linearGradient6049" 24.84 + id="linearGradient6193" 24.85 + gradientUnits="userSpaceOnUse" 24.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 24.87 + x1="333.91171" 24.88 + y1="488.79077" 24.89 + x2="508.94543" 24.90 + y2="263.79077" /> 24.91 + <linearGradient 24.92 + inkscape:collect="always" 24.93 + xlink:href="#linearGradient6049" 24.94 + id="linearGradient6216" 24.95 + gradientUnits="userSpaceOnUse" 24.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 24.97 + x1="333.91171" 24.98 + y1="488.79077" 24.99 + x2="508.94543" 24.100 + y2="263.79077" /> 24.101 + <linearGradient 24.102 + inkscape:collect="always" 24.103 + xlink:href="#linearGradient6049" 24.104 + id="linearGradient6232" 24.105 + gradientUnits="userSpaceOnUse" 24.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 24.107 + x1="333.91171" 24.108 + y1="488.79077" 24.109 + x2="508.94543" 24.110 + y2="263.79077" /> 24.111 + <linearGradient 24.112 + inkscape:collect="always" 24.113 + xlink:href="#linearGradient6049" 24.114 + id="linearGradient6445" 24.115 + gradientUnits="userSpaceOnUse" 24.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 24.117 + x1="333.91171" 24.118 + y1="488.79077" 24.119 + x2="508.94543" 24.120 + y2="263.79077" /> 24.121 + <linearGradient 24.122 + inkscape:collect="always" 24.123 + xlink:href="#linearGradient6049" 24.124 + id="linearGradient6974" 24.125 + gradientUnits="userSpaceOnUse" 24.126 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 24.127 + x1="333.91171" 24.128 + y1="488.79077" 24.129 + x2="508.94543" 24.130 + y2="263.79077" /> 24.131 + <linearGradient 24.132 + inkscape:collect="always" 24.133 + xlink:href="#linearGradient6049" 24.134 + id="linearGradient6996" 24.135 + gradientUnits="userSpaceOnUse" 24.136 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 24.137 + x1="333.91171" 24.138 + y1="488.79077" 24.139 + x2="508.94543" 24.140 + y2="263.79077" /> 24.141 + </defs> 24.142 + <sodipodi:namedview 24.143 + id="base" 24.144 + pagecolor="#ffffff" 24.145 + bordercolor="#666666" 24.146 + borderopacity="1.0" 24.147 + gridtolerance="10000" 24.148 + guidetolerance="10" 24.149 + objecttolerance="10" 24.150 + inkscape:pageopacity="0.0" 24.151 + inkscape:pageshadow="2" 24.152 + inkscape:zoom="1.28" 24.153 + inkscape:cx="345.85973" 24.154 + inkscape:cy="690.49342" 24.155 + inkscape:document-units="px" 24.156 + inkscape:current-layer="layer1" 24.157 + showguides="true" 24.158 + inkscape:guide-bbox="true" 24.159 + inkscape:window-width="906" 24.160 + inkscape:window-height="620" 24.161 + inkscape:window-x="0" 24.162 + inkscape:window-y="25"> 24.163 + <sodipodi:guide 24.164 + orientation="vertical" 24.165 + position="-1.4285714" 24.166 + id="guide6022" /> 24.167 + </sodipodi:namedview> 24.168 + <metadata 24.169 + id="metadata5976"> 24.170 + <rdf:RDF> 24.171 + <cc:Work 24.172 + rdf:about=""> 24.173 + <dc:format>image/svg+xml</dc:format> 24.174 + <dc:type 24.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 24.176 + </cc:Work> 24.177 + </rdf:RDF> 24.178 + </metadata> 24.179 + <g 24.180 + inkscape:label="Layer 1" 24.181 + inkscape:groupmode="layer" 24.182 + id="layer1"> 24.183 + <rect 24.184 + y="246.06918" 24.185 + x="64.325172" 24.186 + height="204.26233" 24.187 + width="333.2135" 24.188 + id="rect6047" 24.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" /> 24.190 + <g 24.191 + id="g6976" 24.192 + transform="translate(70,0)"> 24.193 + <rect 24.194 + y="327.9104" 24.195 + x="40.113693" 24.196 + height="44.537449" 24.197 + width="134.53746" 24.198 + id="rect6004" 24.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" /> 24.200 + <text 24.201 + id="text6006" 24.202 + y="353.67111" 24.203 + x="62.654205" 24.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" 24.205 + xml:space="preserve"><tspan 24.206 + style="font-family:Courier" 24.207 + y="353.67111" 24.208 + x="62.654205" 24.209 + id="tspan6008" 24.210 + sodipodi:role="line">7b064d8bac5e</tspan></text> 24.211 + </g> 24.212 + <path 24.213 + inkscape:connector-type="polyline" 24.214 + id="path6020" 24.215 + d="M 160.92915,311.15532 L 167.83571,327.53627" 24.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" 24.217 + inkscape:connection-end="#g6976" 24.218 + inkscape:connection-start="#g1935" /> 24.219 + <rect 24.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" 24.221 + id="rect6039" 24.222 + width="134.53746" 24.223 + height="44.537449" 24.224 + x="110.11359" 24.225 + y="389.57703" /> 24.226 + <text 24.227 + xml:space="preserve" 24.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" 24.229 + x="134.79706" 24.230 + y="415.33771" 24.231 + id="text6041"><tspan 24.232 + sodipodi:role="line" 24.233 + id="tspan6043" 24.234 + x="134.79706" 24.235 + y="415.33771" 24.236 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 24.237 + <path 24.238 + inkscape:connection-end="#rect6039" 24.239 + inkscape:connector-type="polyline" 24.240 + id="path6045" 24.241 + d="M 177.38238,372.82195 L 177.38235,389.20303" 24.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" /> 24.243 + <rect 24.244 + y="245.94225" 24.245 + x="447.28412" 24.246 + height="204.51619" 24.247 + width="174.36833" 24.248 + id="rect6140" 24.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" /> 24.250 + <g 24.251 + id="g6130" 24.252 + transform="translate(152.3254,24.38544)"> 24.253 + <rect 24.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" 24.255 + id="rect6106" 24.256 + width="134.53746" 24.257 + height="44.537449" 24.258 + x="314.87415" 24.259 + y="257.95059" /> 24.260 + <text 24.261 + xml:space="preserve" 24.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" 24.263 + x="339.55664" 24.264 + y="283.7113" 24.265 + id="text6108"><tspan 24.266 + sodipodi:role="line" 24.267 + id="tspan6110" 24.268 + x="339.55664" 24.269 + y="283.7113" 24.270 + style="font-family:Courier">ffb20e1701ea</tspan></text> 24.271 + </g> 24.272 + <g 24.273 + id="g6135" 24.274 + transform="translate(153.0396,49.83106)"> 24.275 + <rect 24.276 + inkscape:transform-center-y="102.85714" 24.277 + inkscape:transform-center-x="129.28571" 24.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" 24.279 + id="rect6112" 24.280 + width="134.53746" 24.281 + height="44.537449" 24.282 + x="314.15985" 24.283 + y="326.52203" /> 24.284 + <text 24.285 + inkscape:transform-center-y="102.7311" 24.286 + inkscape:transform-center-x="128.69672" 24.287 + xml:space="preserve" 24.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" 24.289 + x="338.84335" 24.290 + y="352.28271" 24.291 + id="text6114"><tspan 24.292 + sodipodi:role="line" 24.293 + id="tspan6116" 24.294 + x="338.84335" 24.295 + y="352.28271" 24.296 + style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 24.297 + </g> 24.298 + <text 24.299 + xml:space="preserve" 24.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" 24.301 + x="466.63208" 24.302 + y="270.479" 24.303 + id="text6118"><tspan 24.304 + sodipodi:role="line" 24.305 + id="tspan6120" 24.306 + x="466.63208" 24.307 + y="270.479">First parent (unchanged)</tspan></text> 24.308 + <text 24.309 + xml:space="preserve" 24.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" 24.311 + x="466.07544" 24.312 + y="364.49615" 24.313 + id="text6122"><tspan 24.314 + sodipodi:role="line" 24.315 + id="tspan6124" 24.316 + x="466.07544" 24.317 + y="364.49615">Second parent</tspan></text> 24.318 + <text 24.319 + xml:space="preserve" 24.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" 24.321 + x="446.61743" 24.322 + y="231.36218" 24.323 + id="text6195"><tspan 24.324 + sodipodi:role="line" 24.325 + id="tspan6197" 24.326 + x="446.61743" 24.327 + y="231.36218">Parents of working directory</tspan></text> 24.328 + <path 24.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" 24.330 + d="M 466.82542,300.21999 L 377.00207,294.39744" 24.331 + id="path6266" 24.332 + inkscape:connector-type="polyline" 24.333 + inkscape:connection-start="#g6130" 24.334 + inkscape:connection-end="#rect1925" /> 24.335 + <path 24.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" 24.337 + d="M 665.12232,418.17579 L 665.12232,418.17579" 24.338 + id="path6270" 24.339 + inkscape:connector-type="polyline" /> 24.340 + <g 24.341 + id="g2845"> 24.342 + <rect 24.343 + y="266.24374" 24.344 + x="242.09048" 24.345 + height="44.537449" 24.346 + width="134.53746" 24.347 + id="rect1925" 24.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" /> 24.349 + <text 24.350 + id="text1927" 24.351 + y="292.00446" 24.352 + x="266.77298" 24.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" 24.354 + xml:space="preserve"><tspan 24.355 + style="font-family:Courier" 24.356 + y="292.00446" 24.357 + x="266.77298" 24.358 + id="tspan1929" 24.359 + sodipodi:role="line">ffb20e1701ea</tspan></text> 24.360 + </g> 24.361 + <path 24.362 + inkscape:connector-type="polyline" 24.363 + id="path1933" 24.364 + d="M 260.89978,311.15532 L 225.84185,327.53627" 24.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" 24.366 + inkscape:connection-end="#g6976" /> 24.367 + <text 24.368 + xml:space="preserve" 24.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" 24.370 + x="109.45568" 24.371 + y="231.4554" 24.372 + id="text2837"><tspan 24.373 + sodipodi:role="line" 24.374 + id="tspan2839" 24.375 + x="109.45568" 24.376 + y="231.4554">Pre-existing head</tspan></text> 24.377 + <text 24.378 + xml:space="preserve" 24.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" 24.380 + x="237.54184" 24.381 + y="231.4554" 24.382 + id="text2841"><tspan 24.383 + sodipodi:role="line" 24.384 + id="tspan2843" 24.385 + x="237.54184" 24.386 + y="231.4554">Newly created head (and tip)</tspan></text> 24.387 + <path 24.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)" 24.389 + d="M 148.05048,235.87482 L 149.94915,265.86962" 24.390 + id="path2850" 24.391 + inkscape:connector-type="polyline" 24.392 + inkscape:connection-end="#g1935" /> 24.393 + <path 24.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)" 24.395 + d="M 303.83495,238.08453 L 306.87874,265.86962" 24.396 + id="path2852" 24.397 + inkscape:connector-type="polyline" 24.398 + inkscape:connection-end="#g2845" /> 24.399 + <path 24.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" 24.401 + d="M 466.82545,379.17944 L 219.0253,307.95488" 24.402 + id="path3016" 24.403 + inkscape:connector-type="polyline" 24.404 + inkscape:connection-start="#g6135" 24.405 + inkscape:connection-end="#g1935" /> 24.406 + <g 24.407 + id="g1935"> 24.408 + <rect 24.409 + y="266.24374" 24.410 + x="84.113708" 24.411 + height="44.537449" 24.412 + width="134.53746" 24.413 + id="rect5996" 24.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" /> 24.415 + <text 24.416 + id="text5998" 24.417 + y="292.00446" 24.418 + x="108.7962" 24.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" 24.420 + xml:space="preserve"><tspan 24.421 + style="font-family:Courier" 24.422 + y="292.00446" 24.423 + x="108.7962" 24.424 + id="tspan6000" 24.425 + sodipodi:role="line">e7639888bb2f</tspan></text> 24.426 + </g> 24.427 + </g> 24.428 +</svg>
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/en/figs/wdir-pre-branch.svg Tue Mar 10 21:58:03 2009 -0700 25.3 @@ -0,0 +1,364 @@ 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="svg5971" 25.18 + sodipodi:version="0.32" 25.19 + inkscape:version="0.44.1" 25.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 25.21 + sodipodi:docname="wdir-branch.svg"> 25.22 + <defs 25.23 + id="defs5973"> 25.24 + <marker 25.25 + inkscape:stockid="Arrow1Mstart" 25.26 + orient="auto" 25.27 + refY="0.0" 25.28 + refX="0.0" 25.29 + id="Arrow1Mstart" 25.30 + style="overflow:visible"> 25.31 + <path 25.32 + id="path4855" 25.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 " 25.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 25.35 + transform="scale(0.4) translate(10,0)" /> 25.36 + </marker> 25.37 + <linearGradient 25.38 + id="linearGradient6049"> 25.39 + <stop 25.40 + style="stop-color:#686868;stop-opacity:1;" 25.41 + offset="0" 25.42 + id="stop6051" /> 25.43 + <stop 25.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 25.45 + offset="1" 25.46 + id="stop6053" /> 25.47 + </linearGradient> 25.48 + <marker 25.49 + inkscape:stockid="Arrow1Mend" 25.50 + orient="auto" 25.51 + refY="0.0" 25.52 + refX="0.0" 25.53 + id="Arrow1Mend" 25.54 + style="overflow:visible;"> 25.55 + <path 25.56 + id="path4852" 25.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 " 25.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 25.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 25.60 + </marker> 25.61 + <linearGradient 25.62 + inkscape:collect="always" 25.63 + xlink:href="#linearGradient6049" 25.64 + id="linearGradient6083" 25.65 + gradientUnits="userSpaceOnUse" 25.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 25.67 + x1="333.91171" 25.68 + y1="488.79077" 25.69 + x2="508.94543" 25.70 + y2="263.79077" /> 25.71 + <linearGradient 25.72 + inkscape:collect="always" 25.73 + xlink:href="#linearGradient6049" 25.74 + id="linearGradient6142" 25.75 + gradientUnits="userSpaceOnUse" 25.76 + gradientTransform="translate(-42.00893,-30.49544)" 25.77 + x1="333.91171" 25.78 + y1="488.79077" 25.79 + x2="508.94543" 25.80 + y2="263.79077" /> 25.81 + <linearGradient 25.82 + inkscape:collect="always" 25.83 + xlink:href="#linearGradient6049" 25.84 + id="linearGradient6193" 25.85 + gradientUnits="userSpaceOnUse" 25.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 25.87 + x1="333.91171" 25.88 + y1="488.79077" 25.89 + x2="508.94543" 25.90 + y2="263.79077" /> 25.91 + <linearGradient 25.92 + inkscape:collect="always" 25.93 + xlink:href="#linearGradient6049" 25.94 + id="linearGradient6216" 25.95 + gradientUnits="userSpaceOnUse" 25.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 25.97 + x1="333.91171" 25.98 + y1="488.79077" 25.99 + x2="508.94543" 25.100 + y2="263.79077" /> 25.101 + <linearGradient 25.102 + inkscape:collect="always" 25.103 + xlink:href="#linearGradient6049" 25.104 + id="linearGradient6232" 25.105 + gradientUnits="userSpaceOnUse" 25.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 25.107 + x1="333.91171" 25.108 + y1="488.79077" 25.109 + x2="508.94543" 25.110 + y2="263.79077" /> 25.111 + <linearGradient 25.112 + inkscape:collect="always" 25.113 + xlink:href="#linearGradient6049" 25.114 + id="linearGradient6445" 25.115 + gradientUnits="userSpaceOnUse" 25.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 25.117 + x1="333.91171" 25.118 + y1="488.79077" 25.119 + x2="508.94543" 25.120 + y2="263.79077" /> 25.121 + <linearGradient 25.122 + inkscape:collect="always" 25.123 + xlink:href="#linearGradient6049" 25.124 + id="linearGradient6974" 25.125 + gradientUnits="userSpaceOnUse" 25.126 + gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 25.127 + x1="333.91171" 25.128 + y1="488.79077" 25.129 + x2="508.94543" 25.130 + y2="263.79077" /> 25.131 + <linearGradient 25.132 + inkscape:collect="always" 25.133 + xlink:href="#linearGradient6049" 25.134 + id="linearGradient6996" 25.135 + gradientUnits="userSpaceOnUse" 25.136 + gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 25.137 + x1="333.91171" 25.138 + y1="488.79077" 25.139 + x2="508.94543" 25.140 + y2="263.79077" /> 25.141 + </defs> 25.142 + <sodipodi:namedview 25.143 + id="base" 25.144 + pagecolor="#ffffff" 25.145 + bordercolor="#666666" 25.146 + borderopacity="1.0" 25.147 + gridtolerance="10000" 25.148 + guidetolerance="10" 25.149 + objecttolerance="10" 25.150 + inkscape:pageopacity="0.0" 25.151 + inkscape:pageshadow="2" 25.152 + inkscape:zoom="0.90509668" 25.153 + inkscape:cx="390.0539" 25.154 + inkscape:cy="690.49342" 25.155 + inkscape:document-units="px" 25.156 + inkscape:current-layer="layer1" 25.157 + showguides="true" 25.158 + inkscape:guide-bbox="true" 25.159 + inkscape:window-width="906" 25.160 + inkscape:window-height="620" 25.161 + inkscape:window-x="0" 25.162 + inkscape:window-y="25"> 25.163 + <sodipodi:guide 25.164 + orientation="vertical" 25.165 + position="-1.4285714" 25.166 + id="guide6022" /> 25.167 + </sodipodi:namedview> 25.168 + <metadata 25.169 + id="metadata5976"> 25.170 + <rdf:RDF> 25.171 + <cc:Work 25.172 + rdf:about=""> 25.173 + <dc:format>image/svg+xml</dc:format> 25.174 + <dc:type 25.175 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 25.176 + </cc:Work> 25.177 + </rdf:RDF> 25.178 + </metadata> 25.179 + <g 25.180 + inkscape:label="Layer 1" 25.181 + inkscape:groupmode="layer" 25.182 + id="layer1"> 25.183 + <rect 25.184 + y="245.94225" 25.185 + x="20.198257" 25.186 + height="204.51619" 25.187 + width="174.36833" 25.188 + id="rect6047" 25.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" /> 25.190 + <rect 25.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" 25.192 + id="rect5996" 25.193 + width="134.53746" 25.194 + height="44.537449" 25.195 + x="40.113693" 25.196 + y="266.24374" /> 25.197 + <text 25.198 + xml:space="preserve" 25.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" 25.200 + x="64.796204" 25.201 + y="292.00446" 25.202 + id="text5998"><tspan 25.203 + sodipodi:role="line" 25.204 + id="tspan6000" 25.205 + x="64.796204" 25.206 + y="292.00446" 25.207 + style="font-family:Courier">e7639888bb2f</tspan></text> 25.208 + <g 25.209 + id="g6976"> 25.210 + <rect 25.211 + y="327.9104" 25.212 + x="40.113693" 25.213 + height="44.537449" 25.214 + width="134.53746" 25.215 + id="rect6004" 25.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" /> 25.217 + <text 25.218 + id="text6006" 25.219 + y="353.67111" 25.220 + x="62.654205" 25.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" 25.222 + xml:space="preserve"><tspan 25.223 + style="font-family:Courier" 25.224 + y="353.67111" 25.225 + x="62.654205" 25.226 + id="tspan6008" 25.227 + sodipodi:role="line">7b064d8bac5e</tspan></text> 25.228 + </g> 25.229 + <path 25.230 + inkscape:connection-end="#rect6004" 25.231 + inkscape:connector-type="polyline" 25.232 + id="path6020" 25.233 + d="M 107.38242,311.15529 L 107.38242,327.53626" 25.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" /> 25.235 + <rect 25.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" 25.237 + id="rect6039" 25.238 + width="134.53746" 25.239 + height="44.537449" 25.240 + x="40.113571" 25.241 + y="389.57703" /> 25.242 + <text 25.243 + xml:space="preserve" 25.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" 25.245 + x="64.797073" 25.246 + y="415.33771" 25.247 + id="text6041"><tspan 25.248 + sodipodi:role="line" 25.249 + id="tspan6043" 25.250 + x="64.797073" 25.251 + y="415.33771" 25.252 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 25.253 + <path 25.254 + inkscape:connection-end="#rect6039" 25.255 + inkscape:connector-type="polyline" 25.256 + id="path6045" 25.257 + d="M 107.38238,372.82195 L 107.38235,389.20301" 25.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" /> 25.259 + <text 25.260 + xml:space="preserve" 25.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" 25.262 + x="19.660461" 25.263 + y="231.36218" 25.264 + id="text6102"><tspan 25.265 + sodipodi:role="line" 25.266 + id="tspan6104" 25.267 + x="19.660461" 25.268 + y="231.36218">History in repository</tspan></text> 25.269 + <rect 25.270 + y="245.94225" 25.271 + x="249.28412" 25.272 + height="204.51619" 25.273 + width="174.36833" 25.274 + id="rect6140" 25.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" /> 25.276 + <g 25.277 + id="g6130" 25.278 + transform="translate(-45.67459,24.38544)"> 25.279 + <rect 25.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" 25.281 + id="rect6106" 25.282 + width="134.53746" 25.283 + height="44.537449" 25.284 + x="314.87415" 25.285 + y="257.95059" /> 25.286 + <text 25.287 + xml:space="preserve" 25.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" 25.289 + x="339.55664" 25.290 + y="283.7113" 25.291 + id="text6108"><tspan 25.292 + sodipodi:role="line" 25.293 + id="tspan6110" 25.294 + x="339.55664" 25.295 + y="283.7113" 25.296 + style="font-family:Courier">7b064d8bac5e</tspan></text> 25.297 + </g> 25.298 + <g 25.299 + id="g6135" 25.300 + transform="translate(-44.96042,49.83106)"> 25.301 + <rect 25.302 + inkscape:transform-center-y="102.85714" 25.303 + inkscape:transform-center-x="129.28571" 25.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" 25.305 + id="rect6112" 25.306 + width="134.53746" 25.307 + height="44.537449" 25.308 + x="314.15985" 25.309 + y="326.52203" /> 25.310 + <text 25.311 + inkscape:transform-center-y="102.7311" 25.312 + inkscape:transform-center-x="128.69672" 25.313 + xml:space="preserve" 25.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" 25.315 + x="338.84335" 25.316 + y="352.28271" 25.317 + id="text6114"><tspan 25.318 + sodipodi:role="line" 25.319 + id="tspan6116" 25.320 + x="338.84335" 25.321 + y="352.28271" 25.322 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 25.323 + </g> 25.324 + <text 25.325 + xml:space="preserve" 25.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" 25.327 + x="268.63208" 25.328 + y="270.479" 25.329 + id="text6118"><tspan 25.330 + sodipodi:role="line" 25.331 + id="tspan6120" 25.332 + x="268.63208" 25.333 + y="270.479">First parent</tspan></text> 25.334 + <text 25.335 + xml:space="preserve" 25.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" 25.337 + x="268.07544" 25.338 + y="364.49615" 25.339 + id="text6122"><tspan 25.340 + sodipodi:role="line" 25.341 + id="tspan6124" 25.342 + x="268.07544" 25.343 + y="364.49615">Second parent</tspan></text> 25.344 + <text 25.345 + xml:space="preserve" 25.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" 25.347 + x="248.61746" 25.348 + y="231.36218" 25.349 + id="text6195"><tspan 25.350 + sodipodi:role="line" 25.351 + id="tspan6197" 25.352 + x="248.61746" 25.353 + y="231.36218">Parents of working directory</tspan></text> 25.354 + <path 25.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" 25.356 + d="M 268.82543,318.06163 L 175.02528,336.72225" 25.357 + id="path6266" 25.358 + inkscape:connector-type="polyline" 25.359 + inkscape:connection-end="#g6976" 25.360 + inkscape:connection-start="#g6130" /> 25.361 + <path 25.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" 25.363 + d="M 665.12232,418.17579 L 665.12232,418.17579" 25.364 + id="path6270" 25.365 + inkscape:connector-type="polyline" /> 25.366 + </g> 25.367 +</svg>
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/en/figs/wdir.svg Tue Mar 10 21:58:03 2009 -0700 26.3 @@ -0,0 +1,348 @@ 26.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 26.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 26.6 +<svg 26.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 26.8 + xmlns:cc="http://web.resource.org/cc/" 26.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 26.10 + xmlns:svg="http://www.w3.org/2000/svg" 26.11 + xmlns="http://www.w3.org/2000/svg" 26.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 26.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 26.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 26.15 + width="744.09448819" 26.16 + height="1052.3622047" 26.17 + id="svg5971" 26.18 + sodipodi:version="0.32" 26.19 + inkscape:version="0.44.1" 26.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 26.21 + sodipodi:docname="wdir.svg"> 26.22 + <defs 26.23 + id="defs5973"> 26.24 + <marker 26.25 + inkscape:stockid="Arrow1Mstart" 26.26 + orient="auto" 26.27 + refY="0.0" 26.28 + refX="0.0" 26.29 + id="Arrow1Mstart" 26.30 + style="overflow:visible"> 26.31 + <path 26.32 + id="path4855" 26.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 " 26.34 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 26.35 + transform="scale(0.4) translate(10,0)" /> 26.36 + </marker> 26.37 + <linearGradient 26.38 + id="linearGradient6049"> 26.39 + <stop 26.40 + style="stop-color:#686868;stop-opacity:1;" 26.41 + offset="0" 26.42 + id="stop6051" /> 26.43 + <stop 26.44 + style="stop-color:#f0f0f0;stop-opacity:1;" 26.45 + offset="1" 26.46 + id="stop6053" /> 26.47 + </linearGradient> 26.48 + <marker 26.49 + inkscape:stockid="Arrow1Mend" 26.50 + orient="auto" 26.51 + refY="0.0" 26.52 + refX="0.0" 26.53 + id="Arrow1Mend" 26.54 + style="overflow:visible;"> 26.55 + <path 26.56 + id="path4852" 26.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 " 26.58 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 26.59 + transform="scale(0.4) rotate(180) translate(10,0)" /> 26.60 + </marker> 26.61 + <linearGradient 26.62 + inkscape:collect="always" 26.63 + xlink:href="#linearGradient6049" 26.64 + id="linearGradient6083" 26.65 + gradientUnits="userSpaceOnUse" 26.66 + gradientTransform="translate(-240.0462,-8.633237e-6)" 26.67 + x1="333.91171" 26.68 + y1="488.79077" 26.69 + x2="508.94543" 26.70 + y2="263.79077" /> 26.71 + <linearGradient 26.72 + inkscape:collect="always" 26.73 + xlink:href="#linearGradient6049" 26.74 + id="linearGradient6142" 26.75 + gradientUnits="userSpaceOnUse" 26.76 + gradientTransform="translate(-42.00893,-30.49544)" 26.77 + x1="333.91171" 26.78 + y1="488.79077" 26.79 + x2="508.94543" 26.80 + y2="263.79077" /> 26.81 + <linearGradient 26.82 + inkscape:collect="always" 26.83 + xlink:href="#linearGradient6049" 26.84 + id="linearGradient6193" 26.85 + gradientUnits="userSpaceOnUse" 26.86 + gradientTransform="translate(-240.0462,-8.633237e-6)" 26.87 + x1="333.91171" 26.88 + y1="488.79077" 26.89 + x2="508.94543" 26.90 + y2="263.79077" /> 26.91 + <linearGradient 26.92 + inkscape:collect="always" 26.93 + xlink:href="#linearGradient6049" 26.94 + id="linearGradient6216" 26.95 + gradientUnits="userSpaceOnUse" 26.96 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 26.97 + x1="333.91171" 26.98 + y1="488.79077" 26.99 + x2="508.94543" 26.100 + y2="263.79077" /> 26.101 + <linearGradient 26.102 + inkscape:collect="always" 26.103 + xlink:href="#linearGradient6049" 26.104 + id="linearGradient6232" 26.105 + gradientUnits="userSpaceOnUse" 26.106 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 26.107 + x1="333.91171" 26.108 + y1="488.79077" 26.109 + x2="508.94543" 26.110 + y2="263.79077" /> 26.111 + <linearGradient 26.112 + inkscape:collect="always" 26.113 + xlink:href="#linearGradient6049" 26.114 + id="linearGradient6445" 26.115 + gradientUnits="userSpaceOnUse" 26.116 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 26.117 + x1="333.91171" 26.118 + y1="488.79077" 26.119 + x2="508.94543" 26.120 + y2="263.79077" /> 26.121 + </defs> 26.122 + <sodipodi:namedview 26.123 + id="base" 26.124 + pagecolor="#ffffff" 26.125 + bordercolor="#666666" 26.126 + borderopacity="1.0" 26.127 + gridtolerance="10000" 26.128 + guidetolerance="10" 26.129 + objecttolerance="10" 26.130 + inkscape:pageopacity="0.0" 26.131 + inkscape:pageshadow="2" 26.132 + inkscape:zoom="0.90509668" 26.133 + inkscape:cx="390.0539" 26.134 + inkscape:cy="690.49342" 26.135 + inkscape:document-units="px" 26.136 + inkscape:current-layer="layer1" 26.137 + showguides="true" 26.138 + inkscape:guide-bbox="true" 26.139 + inkscape:window-width="906" 26.140 + inkscape:window-height="620" 26.141 + inkscape:window-x="0" 26.142 + inkscape:window-y="25"> 26.143 + <sodipodi:guide 26.144 + orientation="vertical" 26.145 + position="-1.4285714" 26.146 + id="guide6022" /> 26.147 + </sodipodi:namedview> 26.148 + <metadata 26.149 + id="metadata5976"> 26.150 + <rdf:RDF> 26.151 + <cc:Work 26.152 + rdf:about=""> 26.153 + <dc:format>image/svg+xml</dc:format> 26.154 + <dc:type 26.155 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 26.156 + </cc:Work> 26.157 + </rdf:RDF> 26.158 + </metadata> 26.159 + <g 26.160 + inkscape:label="Layer 1" 26.161 + inkscape:groupmode="layer" 26.162 + id="layer1"> 26.163 + <g 26.164 + id="g6431" 26.165 + transform="translate(0,-0.137863)"> 26.166 + <rect 26.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" 26.168 + id="rect6047" 26.169 + width="174.36833" 26.170 + height="204.51619" 26.171 + x="94.198257" 26.172 + y="246.08011" /> 26.173 + <rect 26.174 + y="266.38159" 26.175 + x="114.11369" 26.176 + height="44.537449" 26.177 + width="134.53746" 26.178 + id="rect5996" 26.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" /> 26.180 + <text 26.181 + id="text5998" 26.182 + y="292.1423" 26.183 + x="138.7962" 26.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" 26.185 + xml:space="preserve"><tspan 26.186 + style="font-family:Courier" 26.187 + y="292.1423" 26.188 + x="138.7962" 26.189 + id="tspan6000" 26.190 + sodipodi:role="line">e7639888bb2f</tspan></text> 26.191 + <rect 26.192 + y="328.04825" 26.193 + x="114.11369" 26.194 + height="44.537449" 26.195 + width="134.53746" 26.196 + id="rect6004" 26.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" /> 26.198 + <text 26.199 + id="text6006" 26.200 + y="353.80896" 26.201 + x="136.65421" 26.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" 26.203 + xml:space="preserve"><tspan 26.204 + style="font-family:Courier" 26.205 + y="353.80896" 26.206 + x="136.65421" 26.207 + id="tspan6008" 26.208 + sodipodi:role="line">7b064d8bac5e</tspan></text> 26.209 + <path 26.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" 26.211 + d="M 181.38242,311.29315 L 181.38242,327.67412" 26.212 + id="path6020" 26.213 + inkscape:connector-type="polyline" 26.214 + inkscape:connection-end="#rect6004" /> 26.215 + <rect 26.216 + y="389.71487" 26.217 + x="114.11357" 26.218 + height="44.537449" 26.219 + width="134.53746" 26.220 + id="rect6039" 26.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" /> 26.222 + <text 26.223 + id="text6041" 26.224 + y="415.47556" 26.225 + x="138.79707" 26.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" 26.227 + xml:space="preserve"><tspan 26.228 + style="fill:#979797;fill-opacity:1;font-family:Courier" 26.229 + y="415.47556" 26.230 + x="138.79707" 26.231 + id="tspan6043" 26.232 + sodipodi:role="line">000000000000</tspan></text> 26.233 + <path 26.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" 26.235 + d="M 181.38238,372.95981 L 181.38235,389.34087" 26.236 + id="path6045" 26.237 + inkscape:connector-type="polyline" 26.238 + inkscape:connection-end="#rect6039" /> 26.239 + </g> 26.240 + <text 26.241 + xml:space="preserve" 26.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" 26.243 + x="93.660484" 26.244 + y="231.36218" 26.245 + id="text6102"><tspan 26.246 + sodipodi:role="line" 26.247 + id="tspan6104" 26.248 + x="93.660484" 26.249 + y="231.36218">History in repository</tspan></text> 26.250 + <g 26.251 + id="g6416"> 26.252 + <rect 26.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" 26.254 + id="rect6140" 26.255 + width="174.36833" 26.256 + height="204.51619" 26.257 + x="323.28412" 26.258 + y="245.94225" /> 26.259 + <g 26.260 + transform="translate(28.32541,24.38544)" 26.261 + id="g6130"> 26.262 + <rect 26.263 + y="257.95059" 26.264 + x="314.87415" 26.265 + height="44.537449" 26.266 + width="134.53746" 26.267 + id="rect6106" 26.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" /> 26.269 + <text 26.270 + id="text6108" 26.271 + y="283.7113" 26.272 + x="339.55664" 26.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" 26.274 + xml:space="preserve"><tspan 26.275 + style="font-family:Courier" 26.276 + y="283.7113" 26.277 + x="339.55664" 26.278 + id="tspan6110" 26.279 + sodipodi:role="line">e7639888bb2f</tspan></text> 26.280 + </g> 26.281 + <g 26.282 + transform="translate(29.03958,49.83106)" 26.283 + id="g6135"> 26.284 + <rect 26.285 + y="326.52203" 26.286 + x="314.15985" 26.287 + height="44.537449" 26.288 + width="134.53746" 26.289 + id="rect6112" 26.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" 26.291 + inkscape:transform-center-x="129.28571" 26.292 + inkscape:transform-center-y="102.85714" /> 26.293 + <text 26.294 + id="text6114" 26.295 + y="352.28271" 26.296 + x="338.84335" 26.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" 26.298 + xml:space="preserve" 26.299 + inkscape:transform-center-x="128.69672" 26.300 + inkscape:transform-center-y="102.7311"><tspan 26.301 + style="fill:#979797;fill-opacity:1;font-family:Courier" 26.302 + y="352.28271" 26.303 + x="338.84335" 26.304 + id="tspan6116" 26.305 + sodipodi:role="line">000000000000</tspan></text> 26.306 + </g> 26.307 + <text 26.308 + id="text6118" 26.309 + y="270.479" 26.310 + x="342.63208" 26.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" 26.312 + xml:space="preserve"><tspan 26.313 + y="270.479" 26.314 + x="342.63208" 26.315 + id="tspan6120" 26.316 + sodipodi:role="line">First parent</tspan></text> 26.317 + <text 26.318 + id="text6122" 26.319 + y="364.49615" 26.320 + x="342.07544" 26.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" 26.322 + xml:space="preserve"><tspan 26.323 + y="364.49615" 26.324 + x="342.07544" 26.325 + id="tspan6124" 26.326 + sodipodi:role="line">Second parent</tspan></text> 26.327 + </g> 26.328 + <text 26.329 + xml:space="preserve" 26.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" 26.331 + x="322.61746" 26.332 + y="231.36218" 26.333 + id="text6195"><tspan 26.334 + sodipodi:role="line" 26.335 + id="tspan6197" 26.336 + x="322.61746" 26.337 + y="231.36218">Parents of working directory</tspan></text> 26.338 + <path 26.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" 26.340 + d="M 342.82543,299.89384 L 249.02528,293.36123" 26.341 + id="path6266" 26.342 + inkscape:connector-type="polyline" 26.343 + inkscape:connection-start="#g6130" 26.344 + inkscape:connection-end="#rect5996" /> 26.345 + <path 26.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" 26.347 + d="M 665.12232,418.17579 L 665.12232,418.17579" 26.348 + id="path6270" 26.349 + inkscape:connector-type="polyline" /> 26.350 + </g> 26.351 +</svg>
27.1 --- a/en/filelog.svg Tue Mar 10 21:42:19 2009 -0700 27.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 27.3 @@ -1,373 +0,0 @@ 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:xlink="http://www.w3.org/1999/xlink" 27.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 27.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 27.15 - width="744.09448819" 27.16 - height="1052.3622047" 27.17 - id="svg2" 27.18 - sodipodi:version="0.32" 27.19 - inkscape:version="0.45.1" 27.20 - sodipodi:docname="filelog.svg" 27.21 - sodipodi:docbase="/home/arun/hgbook/en" 27.22 - inkscape:output_extension="org.inkscape.output.svg.inkscape"> 27.23 - <defs 27.24 - id="defs4"> 27.25 - <marker 27.26 - inkscape:stockid="Arrow1Mend" 27.27 - orient="auto" 27.28 - refY="0.0" 27.29 - refX="0.0" 27.30 - id="Arrow1Mend" 27.31 - style="overflow:visible;"> 27.32 - <path 27.33 - id="path3128" 27.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 " 27.35 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 27.36 - transform="scale(0.4) rotate(180) translate(10,0)" /> 27.37 - </marker> 27.38 - <linearGradient 27.39 - id="linearGradient2887"> 27.40 - <stop 27.41 - style="stop-color:#91cfcf;stop-opacity:1;" 27.42 - offset="0" 27.43 - id="stop2889" /> 27.44 - <stop 27.45 - style="stop-color:aqua;stop-opacity:0;" 27.46 - offset="1" 27.47 - id="stop2891" /> 27.48 - </linearGradient> 27.49 - <linearGradient 27.50 - id="linearGradient2795"> 27.51 - <stop 27.52 - style="stop-color:#ccc;stop-opacity:1;" 27.53 - offset="0" 27.54 - id="stop2797" /> 27.55 - <stop 27.56 - style="stop-color:#ccc;stop-opacity:0;" 27.57 - offset="1" 27.58 - id="stop2799" /> 27.59 - </linearGradient> 27.60 - <linearGradient 27.61 - inkscape:collect="always" 27.62 - xlink:href="#linearGradient2795" 27.63 - id="linearGradient3170" 27.64 - gradientUnits="userSpaceOnUse" 27.65 - gradientTransform="translate(121.2183,94.95434)" 27.66 - x1="81.322357" 27.67 - y1="404.34424" 27.68 - x2="201.52036" 27.69 - y2="373.03967" /> 27.70 - <linearGradient 27.71 - inkscape:collect="always" 27.72 - xlink:href="#linearGradient2887" 27.73 - id="linearGradient3172" 27.74 - gradientUnits="userSpaceOnUse" 27.75 - gradientTransform="translate(0,12)" 27.76 - x1="62.634491" 27.77 - y1="503.3392" 27.78 - x2="248.49242" 27.79 - y2="462.94327" /> 27.80 - <linearGradient 27.81 - inkscape:collect="always" 27.82 - xlink:href="#linearGradient2795" 27.83 - id="linearGradient3174" 27.84 - gradientUnits="userSpaceOnUse" 27.85 - gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 27.86 - x1="81.322357" 27.87 - y1="404.34424" 27.88 - x2="201.52036" 27.89 - y2="373.03967" /> 27.90 - <linearGradient 27.91 - inkscape:collect="always" 27.92 - xlink:href="#linearGradient2887" 27.93 - id="linearGradient3176" 27.94 - gradientUnits="userSpaceOnUse" 27.95 - gradientTransform="translate(0,12)" 27.96 - x1="62.634491" 27.97 - y1="503.3392" 27.98 - x2="248.49242" 27.99 - y2="462.94327" /> 27.100 - <linearGradient 27.101 - inkscape:collect="always" 27.102 - xlink:href="#linearGradient2795" 27.103 - id="linearGradient3208" 27.104 - gradientUnits="userSpaceOnUse" 27.105 - gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 27.106 - x1="81.322357" 27.107 - y1="404.34424" 27.108 - x2="201.52036" 27.109 - y2="373.03967" /> 27.110 - <linearGradient 27.111 - inkscape:collect="always" 27.112 - xlink:href="#linearGradient2887" 27.113 - id="linearGradient3210" 27.114 - gradientUnits="userSpaceOnUse" 27.115 - gradientTransform="translate(0,12)" 27.116 - x1="62.634491" 27.117 - y1="503.3392" 27.118 - x2="248.49242" 27.119 - y2="462.94327" /> 27.120 - <linearGradient 27.121 - inkscape:collect="always" 27.122 - xlink:href="#linearGradient2795" 27.123 - id="linearGradient3212" 27.124 - gradientUnits="userSpaceOnUse" 27.125 - gradientTransform="translate(121.2183,94.95434)" 27.126 - x1="81.322357" 27.127 - y1="404.34424" 27.128 - x2="201.52036" 27.129 - y2="373.03967" /> 27.130 - <linearGradient 27.131 - inkscape:collect="always" 27.132 - xlink:href="#linearGradient2887" 27.133 - id="linearGradient3214" 27.134 - gradientUnits="userSpaceOnUse" 27.135 - gradientTransform="translate(0,12)" 27.136 - x1="62.634491" 27.137 - y1="503.3392" 27.138 - x2="248.49242" 27.139 - y2="462.94327" /> 27.140 - <linearGradient 27.141 - inkscape:collect="always" 27.142 - xlink:href="#linearGradient2795" 27.143 - id="linearGradient3256" 27.144 - gradientUnits="userSpaceOnUse" 27.145 - gradientTransform="matrix(1.2343775,0,0,0.9981848,103.25588,95.681888)" 27.146 - x1="74.301666" 27.147 - y1="431.67441" 27.148 - x2="260.05884" 27.149 - y2="369.95322" /> 27.150 - <linearGradient 27.151 - inkscape:collect="always" 27.152 - xlink:href="#linearGradient2887" 27.153 - id="linearGradient3258" 27.154 - gradientUnits="userSpaceOnUse" 27.155 - gradientTransform="matrix(1.228929,0,0,0.9972824,-62.037003,13.312997)" 27.156 - x1="62.634491" 27.157 - y1="503.3392" 27.158 - x2="248.49242" 27.159 - y2="462.94327" /> 27.160 - <linearGradient 27.161 - inkscape:collect="always" 27.162 - xlink:href="#linearGradient2795" 27.163 - id="linearGradient3260" 27.164 - gradientUnits="userSpaceOnUse" 27.165 - gradientTransform="matrix(1.2300738,0,0,0.6517275,219.97511,153.61527)" 27.166 - x1="74.387527" 27.167 - y1="431.80576" 27.168 - x2="259.97339" 27.169 - y2="369.82224" /> 27.170 - <linearGradient 27.171 - inkscape:collect="always" 27.172 - xlink:href="#linearGradient2887" 27.173 - id="linearGradient3262" 27.174 - gradientUnits="userSpaceOnUse" 27.175 - gradientTransform="matrix(1.2289272,0,0,0.9972824,-62.036756,13.312985)" 27.176 - x1="62.634491" 27.177 - y1="503.3392" 27.178 - x2="248.49242" 27.179 - y2="462.94327" /> 27.180 - </defs> 27.181 - <sodipodi:namedview 27.182 - id="base" 27.183 - pagecolor="#ffffff" 27.184 - bordercolor="#666666" 27.185 - borderopacity="1.0" 27.186 - gridtolerance="10000" 27.187 - guidetolerance="10" 27.188 - objecttolerance="10" 27.189 - inkscape:pageopacity="0.0" 27.190 - inkscape:pageshadow="2" 27.191 - inkscape:zoom="1.4" 27.192 - inkscape:cx="455.8122" 27.193 - inkscape:cy="520" 27.194 - inkscape:document-units="px" 27.195 - inkscape:current-layer="layer1" 27.196 - inkscape:window-width="1680" 27.197 - inkscape:window-height="970" 27.198 - inkscape:window-x="0" 27.199 - inkscape:window-y="54" /> 27.200 - <metadata 27.201 - id="metadata7"> 27.202 - <rdf:RDF> 27.203 - <cc:Work 27.204 - rdf:about=""> 27.205 - <dc:format>image/svg+xml</dc:format> 27.206 - <dc:type 27.207 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 27.208 - </cc:Work> 27.209 - </rdf:RDF> 27.210 - </metadata> 27.211 - <g 27.212 - inkscape:label="Layer 1" 27.213 - inkscape:groupmode="layer" 27.214 - id="layer1"> 27.215 - <rect 27.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" 27.217 - id="rect3180" 27.218 - width="273.81375" 27.219 - height="199.06245" 27.220 - x="369.1796" 27.221 - y="351.79019" /> 27.222 - <rect 27.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" 27.224 - id="rect3178" 27.225 - width="273.81339" 27.226 - height="199.06233" 27.227 - x="72.699799" 27.228 - y="351.78983" /> 27.229 - <g 27.230 - id="g3144" 27.231 - transform="translate(80.467048,0.71578)"> 27.232 - <g 27.233 - id="g2940"> 27.234 - <rect 27.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" 27.236 - id="rect2914" 27.237 - width="227.38896" 27.238 - height="39.500999" 27.239 - x="311.92496" 27.240 - y="395.08627" /> 27.241 - <text 27.242 - xml:space="preserve" 27.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" 27.244 - x="323.72824" 27.245 - y="416.7626" 27.246 - id="text2918"><tspan 27.247 - sodipodi:role="line" 27.248 - id="tspan2920" 27.249 - x="323.72824" 27.250 - y="416.7626" 27.251 - style="font-family:Courier">.hg/store/data/README.i</tspan></text> 27.252 - </g> 27.253 - <g 27.254 - transform="translate(3.79093e-5,-80.1853)" 27.255 - id="g2945"> 27.256 - <g 27.257 - id="g2955"> 27.258 - <rect 27.259 - y="475.4968" 27.260 - x="15.550935" 27.261 - height="39.500999" 27.262 - width="227.17694" 27.263 - id="rect2947" 27.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" /> 27.265 - <text 27.266 - id="text2949" 27.267 - y="498.35123" 27.268 - x="31.230644" 27.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" 27.270 - xml:space="preserve"><tspan 27.271 - style="font-family:Courier" 27.272 - y="498.35123" 27.273 - x="31.230644" 27.274 - id="tspan2951" 27.275 - sodipodi:role="line">README</tspan></text> 27.276 - </g> 27.277 - </g> 27.278 - <path 27.279 - inkscape:connector-type="polyline" 27.280 - id="path2960" 27.281 - d="M 242.94685,414.91115 C 242.94685,414.91115 293.61127,415.26754 310.16269,415.38633" 27.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" 27.283 - sodipodi:nodetypes="cz" /> 27.284 - </g> 27.285 - <g 27.286 - id="g3156" 27.287 - transform="translate(80.467048,0.71578)"> 27.288 - <g 27.289 - transform="translate(116,0)" 27.290 - id="g2831"> 27.291 - <rect 27.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" 27.293 - id="rect1906" 27.294 - width="228.18446" 27.295 - height="60.499123" 27.296 - x="195.52719" 27.297 - y="465.51859" /> 27.298 - <g 27.299 - id="g2803" 27.300 - transform="translate(-0.893671,1.833581)"> 27.301 - <text 27.302 - id="text1884" 27.303 - y="483.92801" 27.304 - x="208.95944" 27.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" 27.306 - xml:space="preserve"><tspan 27.307 - style="font-family:Courier" 27.308 - y="483.92801" 27.309 - x="208.95944" 27.310 - id="tspan1886" 27.311 - sodipodi:role="line">.hg/store/data/src/hello.c.d</tspan></text> 27.312 - <text 27.313 - id="text1888" 27.314 - y="507.79309" 27.315 - x="208.95944" 27.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" 27.317 - xml:space="preserve"><tspan 27.318 - style="font-family:Courier" 27.319 - y="507.79309" 27.320 - x="208.95944" 27.321 - id="tspan1890" 27.322 - sodipodi:role="line">.hg/store/data/src/hello.c.i</tspan></text> 27.323 - </g> 27.324 - </g> 27.325 - <g 27.326 - id="g2907"> 27.327 - <rect 27.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" 27.329 - id="rect2843" 27.330 - width="227.17728" 27.331 - height="39.500999" 27.332 - x="15.550805" 27.333 - y="475.4968" /> 27.334 - <text 27.335 - xml:space="preserve" 27.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" 27.337 - x="31.230644" 27.338 - y="498.35123" 27.339 - id="text2847"><tspan 27.340 - sodipodi:role="line" 27.341 - id="tspan2849" 27.342 - x="31.230644" 27.343 - y="498.35123" 27.344 - style="font-family:Courier">src/hello.c</tspan></text> 27.345 - </g> 27.346 - <path 27.347 - inkscape:connection-end="#g2831" 27.348 - inkscape:connection-start="#g2907" 27.349 - inkscape:connector-type="polyline" 27.350 - id="path2962" 27.351 - d="M 242.4315,495.88043 C 242.4315,495.88043 292.8861,495.99942 310.04102,496.03909" 27.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" 27.353 - sodipodi:nodetypes="cs" /> 27.354 - </g> 27.355 - <text 27.356 - xml:space="preserve" 27.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" 27.358 - x="98.496666" 27.359 - y="373.96353" 27.360 - id="text3216"><tspan 27.361 - sodipodi:role="line" 27.362 - id="tspan3218" 27.363 - x="98.496666" 27.364 - y="373.96353">Working directory</tspan></text> 27.365 - <text 27.366 - xml:space="preserve" 27.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" 27.368 - x="391.39197" 27.369 - y="373.96353" 27.370 - id="text3228"><tspan 27.371 - sodipodi:role="line" 27.372 - id="tspan3230" 27.373 - x="391.39197" 27.374 - y="373.96353">Repository</tspan></text> 27.375 - </g> 27.376 -</svg>
28.1 --- a/en/fixhtml.py Tue Mar 10 21:42:19 2009 -0700 28.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 28.3 @@ -1,50 +0,0 @@ 28.4 -#!/usr/bin/env python 28.5 -# 28.6 -# This script attempts to work around some of the more bizarre and 28.7 -# quirky behaviours of htlatex. 28.8 -# 28.9 -# - We've persuaded htlatex to produce UTF-8, which unfortunately 28.10 -# causes it to use huge character sequences to represent even the 28.11 -# safe 7-bit ASCII subset of UTF-8. We fix that up. 28.12 -# 28.13 -# - BUT we have to treat angle brackets (for example, redirections in 28.14 -# shell script snippets) specially, otherwise they'll break the 28.15 -# generated HTML. (Reported by Johannes Hoff.) 28.16 -# 28.17 -# - For some reason, htlatex gives a unique ID to each fancyvrb 28.18 -# environment, which makes writing a sane, small CSS stylesheet 28.19 -# impossible. We squish all those IDs down to nothing. 28.20 - 28.21 -import os 28.22 -import sys 28.23 -import re 28.24 - 28.25 -angle_re = re.compile(r'([CE];)') 28.26 -unicode_re = re.compile(r'�([0-7][0-9A-F]);') 28.27 -fancyvrb_re = re.compile(r'id="fancyvrb\d+"', re.I) 28.28 -ligature_re = re.compile(r'ྰ([0-4]);') 28.29 - 28.30 -tmpsuffix = '.tmp.' + str(os.getpid()) 28.31 - 28.32 -def hide_angle(m): 28.33 - return m.group(1).lower() 28.34 - 28.35 -def fix_ascii(m): 28.36 - return chr(int(m.group(1), 16)) 28.37 - 28.38 -ligatures = ['ff', 'fi', 'fl', 'ffi', 'ffl'] 28.39 - 28.40 -def expand_ligature(m): 28.41 - return ligatures[int(m.group(1))] 28.42 - 28.43 -for name in sys.argv[1:]: 28.44 - tmpname = name + tmpsuffix 28.45 - ofp = file(tmpname, 'w') 28.46 - for line in file(name): 28.47 - line = angle_re.sub(hide_angle, line) 28.48 - line = unicode_re.sub(fix_ascii, line) 28.49 - line = ligature_re.sub(expand_ligature, line) 28.50 - line = fancyvrb_re.sub('id="fancyvrb"', line) 28.51 - ofp.write(line) 28.52 - ofp.close() 28.53 - os.rename(tmpname, name)
29.1 --- a/en/hgbook.css Tue Mar 10 21:42:19 2009 -0700 29.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 29.3 @@ -1,441 +0,0 @@ 29.4 -body { 29.5 - font: 12px/1.5 Verdana, sans-serif; 29.6 - padding-top: 50px; 29.7 - padding-left: 80px; 29.8 - padding-right: 80px; 29.9 - padding-bottom: 90px; 29.10 -} 29.11 -.ptmr7t- { 29.12 - font-family: monospace; 29.13 -} 29.14 -.ptmr7t-x-x-172 { 29.15 - font-size: 172%; 29.16 - font-family: monospace; 29.17 -} 29.18 -.ptmr7t-x-x-120 { 29.19 - font-size: 120%; 29.20 -} 29.21 -.zpzccmry-x-x-120 { 29.22 - font-size: 120%; 29.23 - font-weight: bold; 29.24 - font-style: italic; 29.25 -} 29.26 -.zpzccmry-x-x-120 { 29.27 - font-weight: bold; 29.28 - font-style: italic; 29.29 -} 29.30 -.pcrr7tn- { 29.31 - font-family: monospace; 29.32 -} 29.33 -.ptmri7t- { 29.34 - font-style: italic; 29.35 -} 29.36 -.ptmr7t-x-x-50 { 29.37 - font-size: 50%; 29.38 - font-family: monospace; 29.39 -} 29.40 -.ptmb7t- { 29.41 - font-weight: bold; 29.42 -} 29.43 -.zptmcmr- { 29.44 - font-style: italic; 29.45 -} 29.46 -.zptmcmrm- { 29.47 - font-style: italic; 29.48 -} 29.49 -.zpzccmry- { 29.50 - font-weight: bold; 29.51 - font-style: italic; 29.52 -} 29.53 -.pcrb7t- { 29.54 - font-family: monospace; 29.55 - font-weight: bold; 29.56 -} 29.57 -.pcrro7t- { 29.58 - font-family: monospace; 29.59 - font-style: oblique; 29.60 -} 29.61 -p.noindent { 29.62 - text-indent: 0em; 29.63 - margin: 0em; 29.64 -} 29.65 -p.nopar { 29.66 - text-indent: 0em; 29.67 -} 29.68 -p.indent { 29.69 - text-indent: 1.5em; 29.70 - margin: 0em; 29.71 -} 29.72 -a img { 29.73 - border-top: 0; 29.74 - border-left: 0; 29.75 - border-right: 0; 29.76 -} 29.77 -center { 29.78 - margin-top: 1em; 29.79 - margin-bottom: 1em; 29.80 -} 29.81 -td center { 29.82 - margin-top: 0em; 29.83 - margin-bottom: 0em; 29.84 -} 29.85 -.Canvas { 29.86 - position: relative; 29.87 -} 29.88 -img.math { 29.89 - vertical-align: middle; 29.90 -} 29.91 -li p.indent { 29.92 - text-indent: 0em; 29.93 -} 29.94 -.enumerate1 { 29.95 - list-style-type: decimal; 29.96 -} 29.97 -.enumerate2 { 29.98 - list-style-type: lower-alpha; 29.99 -} 29.100 -.enumerate3 { 29.101 - list-style-type: lower-roman; 29.102 -} 29.103 -.enumerate4 { 29.104 - list-style-type: upper-alpha; 29.105 -} 29.106 -div.newtheorem { 29.107 - margin-bottom: 2em; 29.108 - margin-top: 2em; 29.109 -} 29.110 -.obeylines-h,.obeylines-v { 29.111 - white-space: nowrap; 29.112 -} 29.113 -div.obeylines-v p { 29.114 - margin-top: 0; 29.115 - margin-bottom: 0; 29.116 -} 29.117 -.overline { 29.118 - text-decoration: overline; 29.119 -} 29.120 -.overline img { 29.121 - border-top: 1px solid black; 29.122 -} 29.123 -td.displaylines { 29.124 - text-align: center; 29.125 - white-space: nowrap; 29.126 -} 29.127 -.centerline { 29.128 - text-align: center; 29.129 -} 29.130 -.rightline { 29.131 - text-align: right; 29.132 -} 29.133 -div.verbatim { 29.134 - font-family: monospace; 29.135 - white-space: nowrap; 29.136 -} 29.137 -table.verbatim { 29.138 - width: 100%; 29.139 -} 29.140 -.fbox { 29.141 - background: url(note.png) no-repeat #cec; 29.142 - padding-left: 65px; 29.143 - padding-top: 1em; 29.144 - padding-bottom: 1em; 29.145 - padding-right: 1em; 29.146 - text-indent: 0pt; 29.147 - border: dotted black 1px; 29.148 -} 29.149 -div.center div.fbox { 29.150 - text-align: center; 29.151 - clear: both; 29.152 - padding-left: 3.0pt; 29.153 - padding-right: 3.0pt; 29.154 - text-indent: 0pt; 29.155 - border: solid black 0.4pt; 29.156 -} 29.157 -table.minipage { 29.158 - width: 100%; 29.159 -} 29.160 -div.center, div.center div.center { 29.161 - text-align: center; 29.162 - margin-left: 1em; 29.163 - margin-right: 1em; 29.164 -} 29.165 -div.center div { 29.166 - text-align: left; 29.167 -} 29.168 -div.flushright, div.flushright div.flushright { 29.169 - text-align: right; 29.170 -} 29.171 -div.flushright div { 29.172 - text-align: left; 29.173 -} 29.174 -div.flushleft { 29.175 - text-align: left; 29.176 -} 29.177 -.underline { 29.178 - text-decoration: underline; 29.179 -} 29.180 -.underline img { 29.181 - border-bottom: 1px solid black; 29.182 - margin-bottom: 1pt; 29.183 -} 29.184 -.framebox-c, .framebox-l, .framebox-r { 29.185 - padding-left: 3.0pt; 29.186 - padding-right: 3.0pt; 29.187 - text-indent: 0pt; 29.188 - border: solid black 0.4pt; 29.189 -} 29.190 -.framebox-c { 29.191 - text-align: center; 29.192 -} 29.193 -.framebox-l { 29.194 - text-align: left; 29.195 -} 29.196 -.framebox-r { 29.197 - text-align: right; 29.198 -} 29.199 -span.thank-mark { 29.200 - vertical-align: super 29.201 -} 29.202 -span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript { 29.203 - font-size: 80%; 29.204 -} 29.205 -div.tabular, div.center div.tabular { 29.206 - text-align: center; 29.207 - margin-top: 0.5em; 29.208 - margin-bottom: 0.5em; 29.209 -} 29.210 -table.tabular td p { 29.211 - margin-top: 0em; 29.212 -} 29.213 -table.tabular { 29.214 - margin-left: auto; 29.215 - margin-right: auto; 29.216 -} 29.217 -div.td00 { 29.218 - margin-left: 0pt; 29.219 - margin-right: 0pt; 29.220 -} 29.221 -div.td01 { 29.222 - margin-left: 0pt; 29.223 - margin-right: 5pt; 29.224 -} 29.225 -div.td10 { 29.226 - margin-left: 5pt; 29.227 - margin-right: 0pt; 29.228 -} 29.229 -div.td11 { 29.230 - margin-left: 5pt; 29.231 - margin-right: 5pt; 29.232 -} 29.233 -table[rules] { 29.234 - border-left: solid black 0.4pt; 29.235 - border-right: solid black 0.4pt; 29.236 -} 29.237 -td.td00 { 29.238 - padding-left: 0pt; 29.239 - padding-right: 0pt; 29.240 -} 29.241 -td.td01 { 29.242 - padding-left: 0pt; 29.243 - padding-right: 5pt; 29.244 -} 29.245 -td.td10 { 29.246 - padding-left: 5pt; 29.247 - padding-right: 0pt; 29.248 -} 29.249 -td.td11 { 29.250 - padding-left: 5pt; 29.251 - padding-right: 5pt; 29.252 -} 29.253 -table[rules] { 29.254 - border-left: solid black 0.4pt; 29.255 - border-right: solid black 0.4pt; 29.256 -} 29.257 -.hline hr, .cline hr { 29.258 - height : 1px; 29.259 - margin: 0px; 29.260 -} 29.261 -.tabbing-right { 29.262 - text-align: right; 29.263 -} 29.264 -span.TEX { 29.265 - letter-spacing: -0.125em; 29.266 -} 29.267 -span.TEX span.E { 29.268 - position: relative;top: 0.5ex;left: -0.0417em; 29.269 -} 29.270 -a span.TEX span.E { 29.271 - text-decoration: none; 29.272 -} 29.273 -span.LATEX span.A { 29.274 - position: relative; 29.275 - top: -0.5ex; 29.276 - left: -0.4em; 29.277 - font-size: 85%; 29.278 -} 29.279 -span.LATEX span.TEX { 29.280 - position: relative; 29.281 - left: -0.4em; 29.282 -} 29.283 -div.float img, div.float .caption { 29.284 - text-align: center; 29.285 -} 29.286 -div.figure img, div.figure .caption { 29.287 - text-align: center; 29.288 -} 29.289 -.marginpar { 29.290 - width: 20%; 29.291 - float: right; 29.292 - text-align: left; 29.293 - margin-left: auto; 29.294 - margin-top: 0.5em; 29.295 - font-size: 85%; 29.296 - text-decoration: underline; 29.297 -} 29.298 -.marginpar p { 29.299 - margin-top: 0.4em; 29.300 - margin-bottom: 0.4em; 29.301 -} 29.302 -table.equation { 29.303 - width: 100%; 29.304 -} 29.305 -.equation td { 29.306 - text-align: center; 29.307 -} 29.308 -td.equation { 29.309 - margin-top: 1em; 29.310 - margin-bottom: 1em; 29.311 -} 29.312 -td.equation-label { 29.313 - width: 5%; 29.314 - text-align: center; 29.315 -} 29.316 -td.eqnarray4 { 29.317 - width: 5%; 29.318 - white-space: normal; 29.319 -} 29.320 -td.eqnarray2 { 29.321 - width: 5%; 29.322 -} 29.323 -table.eqnarray-star, table.eqnarray { 29.324 - width: 100%; 29.325 -} 29.326 -div.eqnarray { 29.327 - text-align: center; 29.328 -} 29.329 -div.array { 29.330 - text-align: center; 29.331 -} 29.332 -div.pmatrix { 29.333 - text-align: center; 29.334 -} 29.335 -table.pmatrix { 29.336 - width: 100%; 29.337 -} 29.338 -span.pmatrix img { 29.339 - vertical-align: middle; 29.340 -} 29.341 -div.pmatrix { 29.342 - text-align: center; 29.343 -} 29.344 -table.pmatrix { 29.345 - width: 100%; 29.346 -} 29.347 -img.cdots { 29.348 - vertical-align: middle; 29.349 -} 29.350 -.partToc a, .partToc, .likepartToc a, .likepartToc { 29.351 - line-height: 200%; 29.352 - font-weight: bold; 29.353 - font-size: 110%; 29.354 -} 29.355 -.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc { 29.356 - line-height: 200%; 29.357 - font-weight: bold; 29.358 -} 29.359 -.caption td.id { 29.360 - font-weight: bold; 29.361 - white-space: nowrap; 29.362 -} 29.363 -table.caption { 29.364 - text-align: center; 29.365 -} 29.366 -h1.partHead { 29.367 - text-align: center; 29.368 -} 29.369 -p.bibitem { 29.370 - text-indent: -2em; 29.371 - margin-left: 2em; 29.372 - margin-top: 0.6em; 29.373 - margin-bottom: 0.6em; 29.374 -} 29.375 -p.bibitem-p { 29.376 - text-indent: 0em; 29.377 - margin-left: 2em; 29.378 - margin-top: 0.6em; 29.379 - margin-bottom: 0.6em; 29.380 -} 29.381 -.paragraphHead, .likeparagraphHead { 29.382 - margin-top: 2em; 29.383 - font-weight: bold; 29.384 -} 29.385 -.subparagraphHead, .likesubparagraphHead { 29.386 - font-weight: bold; 29.387 -} 29.388 -.quote { 29.389 - margin-bottom: 0.25em; 29.390 - margin-top: 0.25em; 29.391 - margin-left: 1em; 29.392 - margin-right: 1em; 29.393 - text-align: justify; 29.394 -} 29.395 -.verse { 29.396 - white-space: nowrap; 29.397 - margin-left: 2em} 29.398 -div.maketitle { 29.399 - text-align: center; 29.400 -} 29.401 -h2.titleHead { 29.402 - text-align: center; 29.403 -} 29.404 -div.maketitle { 29.405 - margin-bottom: 2em; 29.406 -} 29.407 -div.author, div.date { 29.408 - text-align: center; 29.409 -} 29.410 -div.thanks { 29.411 - text-align: left; 29.412 - margin-left: 10%; 29.413 - font-size: 85%; 29.414 - font-style: italic; 29.415 -} 29.416 -div.author { 29.417 - white-space: nowrap; 29.418 -} 29.419 -.quotation { 29.420 - margin-bottom: 0.25em; 29.421 - margin-top: 0.25em; 29.422 - margin-left: 1em; 29.423 -} 29.424 -h1.partHead { 29.425 - text-align: center; 29.426 -} 29.427 -img.graphics { 29.428 - margin-left: 10%; 29.429 -} 29.430 -.figure { 29.431 - width: 100%; 29.432 -} 29.433 -P.fancyvrb { 29.434 - white-space: nowrap; 29.435 -} 29.436 -hr { 29.437 - border: 0; 29.438 - height: 1px; 29.439 -} 29.440 -div#fancyvrb { 29.441 - white-space: nowrap; 29.442 - background: #eee; 29.443 - padding: 1em; 29.444 -}
30.1 --- a/en/htlatex.book Tue Mar 10 21:42:19 2009 -0700 30.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 30.3 @@ -1,12 +0,0 @@ 30.4 -#!/bin/bash 30.5 -# 30.6 -# This script is horrible. It's essentially a hacked copy of 30.7 -# /usr/bin/htlatex from Fedora Core 6. I apologise for any lasting 30.8 -# pain reading it causes. 30.9 - 30.10 -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 30.11 -(cd $4 && bibtex hgbook) 30.12 -(cd $4 && makeindex hgbook) 30.13 -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 30.14 -latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1 30.15 -echo status $$
31.1 Binary file en/kdiff3.png has changed
32.1 --- a/en/metadata.svg Tue Mar 10 21:42:19 2009 -0700 32.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 32.3 @@ -1,328 +0,0 @@ 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="metadata.svg" 32.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 32.21 - <defs 32.22 - id="defs4"> 32.23 - <marker 32.24 - inkscape:stockid="Arrow1Mend" 32.25 - orient="auto" 32.26 - refY="0.0" 32.27 - refX="0.0" 32.28 - id="Arrow1Mend" 32.29 - style="overflow:visible;"> 32.30 - <path 32.31 - id="path2944" 32.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 " 32.33 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 32.34 - transform="scale(0.4) rotate(180) translate(10,0)" /> 32.35 - </marker> 32.36 - </defs> 32.37 - <sodipodi:namedview 32.38 - id="base" 32.39 - pagecolor="#ffffff" 32.40 - bordercolor="#666666" 32.41 - borderopacity="1.0" 32.42 - gridtolerance="10000" 32.43 - guidetolerance="10" 32.44 - objecttolerance="10" 32.45 - inkscape:pageopacity="0.0" 32.46 - inkscape:pageshadow="2" 32.47 - inkscape:zoom="1.4" 32.48 - inkscape:cx="232.14286" 32.49 - inkscape:cy="490.68696" 32.50 - inkscape:document-units="px" 32.51 - inkscape:current-layer="layer1" 32.52 - inkscape:window-width="906" 32.53 - inkscape:window-height="620" 32.54 - inkscape:window-x="181" 32.55 - inkscape:window-y="58" /> 32.56 - <metadata 32.57 - id="metadata7"> 32.58 - <rdf:RDF> 32.59 - <cc:Work 32.60 - rdf:about=""> 32.61 - <dc:format>image/svg+xml</dc:format> 32.62 - <dc:type 32.63 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 32.64 - </cc:Work> 32.65 - </rdf:RDF> 32.66 - </metadata> 32.67 - <g 32.68 - inkscape:label="Layer 1" 32.69 - inkscape:groupmode="layer" 32.70 - id="layer1"> 32.71 - <path 32.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" 32.73 - d="M 326.94646,467.18359 L 326.94646,510.98123" 32.74 - id="path1910" 32.75 - inkscape:connector-type="polyline" 32.76 - inkscape:connection-end="#rect2962" 32.77 - inkscape:connection-start="#rect2764" /> 32.78 - <path 32.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" 32.80 - d="M 326.94646,531.98123 L 326.94646,591.77887" 32.81 - id="path1912" 32.82 - inkscape:connector-type="polyline" 32.83 - inkscape:connection-start="#rect2962" 32.84 - inkscape:connection-end="#rect3000" /> 32.85 - <path 32.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" 32.87 - d="M 316.1622,531.98123 L 192.30212,652.57648" 32.88 - id="path1916" 32.89 - inkscape:connector-type="polyline" 32.90 - inkscape:connection-end="#rect3038" 32.91 - inkscape:connection-start="#rect2962" /> 32.92 - <path 32.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" 32.94 - d="M 254.23217,467.18359 L 254.23216,510.98123" 32.95 - id="path3088" 32.96 - inkscape:connector-type="polyline" 32.97 - inkscape:connection-start="#rect1872" 32.98 - inkscape:connection-end="#rect2960" /> 32.99 - <path 32.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" 32.101 - d="M 254.23215,531.98123 L 254.23215,591.77887" 32.102 - id="path3090" 32.103 - inkscape:connector-type="polyline" 32.104 - inkscape:connection-start="#rect2960" 32.105 - inkscape:connection-end="#rect2998" /> 32.106 - <path 32.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" 32.108 - d="M 248.84002,531.98123 L 186.90999,652.57648" 32.109 - id="path3092" 32.110 - inkscape:connector-type="polyline" 32.111 - inkscape:connection-start="#rect2960" 32.112 - inkscape:connection-end="#rect3038" /> 32.113 - <rect 32.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" 32.115 - id="rect1872" 32.116 - width="51.42857" 32.117 - height="20" 32.118 - x="228.51788" 32.119 - y="446.68359" /> 32.120 - <rect 32.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" 32.122 - id="rect2764" 32.123 - width="51.42857" 32.124 - height="20" 32.125 - x="301.23218" 32.126 - y="446.68359" /> 32.127 - <rect 32.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" 32.129 - id="rect2766" 32.130 - width="51.42857" 32.131 - height="20" 32.132 - x="155.80359" 32.133 - y="446.68359" /> 32.134 - <rect 32.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" 32.136 - id="rect2768" 32.137 - width="51.42857" 32.138 - height="20" 32.139 - x="83.089294" 32.140 - y="446.68359" /> 32.141 - <path 32.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" 32.143 - d="M 135.01786,456.68359 L 155.30359,456.68359" 32.144 - id="path2770" 32.145 - inkscape:connector-type="polyline" 32.146 - inkscape:connection-start="#rect2768" 32.147 - inkscape:connection-end="#rect2766" /> 32.148 - <path 32.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" 32.150 - d="M 207.73216,456.68359 L 228.01788,456.68359" 32.151 - id="path2772" 32.152 - inkscape:connector-type="polyline" 32.153 - inkscape:connection-start="#rect2766" 32.154 - inkscape:connection-end="#rect1872" /> 32.155 - <path 32.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" 32.157 - d="M 280.44645,456.68359 L 300.73218,456.68359" 32.158 - id="path2774" 32.159 - inkscape:connector-type="polyline" 32.160 - inkscape:connection-start="#rect1872" 32.161 - inkscape:connection-end="#rect2764" /> 32.162 - <path 32.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" 32.164 - d="M 62.303571,456.68359 L 82.589294,456.68359" 32.165 - id="path2778" 32.166 - inkscape:connector-type="polyline" 32.167 - inkscape:connection-end="#rect2768" /> 32.168 - <rect 32.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" 32.170 - id="rect2960" 32.171 - width="51.42857" 32.172 - height="20" 32.173 - x="228.51787" 32.174 - y="511.48123" /> 32.175 - <rect 32.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" 32.177 - id="rect2962" 32.178 - width="51.42857" 32.179 - height="20" 32.180 - x="301.23218" 32.181 - y="511.48123" /> 32.182 - <rect 32.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" 32.184 - id="rect2964" 32.185 - width="51.42857" 32.186 - height="20" 32.187 - x="155.80357" 32.188 - y="511.48123" /> 32.189 - <rect 32.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" 32.191 - id="rect2966" 32.192 - width="51.42857" 32.193 - height="20" 32.194 - x="83.089287" 32.195 - y="511.48123" /> 32.196 - <path 32.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" 32.198 - d="M 135.01786,521.48121 L 155.30359,521.48121" 32.199 - id="path2968" 32.200 - inkscape:connector-type="polyline" /> 32.201 - <path 32.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" 32.203 - d="M 207.73216,521.48121 L 228.01788,521.48121" 32.204 - id="path2970" 32.205 - inkscape:connector-type="polyline" /> 32.206 - <path 32.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" 32.208 - d="M 280.44645,521.48121 L 300.73218,521.48121" 32.209 - id="path2972" 32.210 - inkscape:connector-type="polyline" /> 32.211 - <path 32.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" 32.213 - d="M 62.30358,521.48121 L 82.5893,521.48121" 32.214 - id="path2974" 32.215 - inkscape:connector-type="polyline" /> 32.216 - <rect 32.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" 32.218 - id="rect2998" 32.219 - width="51.42857" 32.220 - height="20" 32.221 - x="228.51787" 32.222 - y="592.27887" /> 32.223 - <rect 32.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" 32.225 - id="rect3000" 32.226 - width="51.42857" 32.227 - height="20" 32.228 - x="301.23218" 32.229 - y="592.27887" /> 32.230 - <rect 32.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" 32.232 - id="rect3002" 32.233 - width="51.42857" 32.234 - height="20" 32.235 - x="155.80357" 32.236 - y="592.27887" /> 32.237 - <rect 32.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" 32.239 - id="rect3004" 32.240 - width="51.42857" 32.241 - height="20" 32.242 - x="83.089287" 32.243 - y="592.27887" /> 32.244 - <path 32.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" 32.246 - d="M 135.01786,602.27884 L 155.30359,602.27884" 32.247 - id="path3006" 32.248 - inkscape:connector-type="polyline" /> 32.249 - <path 32.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" 32.251 - d="M 207.73216,602.27884 L 228.01788,602.27884" 32.252 - id="path3008" 32.253 - inkscape:connector-type="polyline" /> 32.254 - <path 32.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" 32.256 - d="M 280.44645,602.27884 L 300.73218,602.27884" 32.257 - id="path3010" 32.258 - inkscape:connector-type="polyline" /> 32.259 - <path 32.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" 32.261 - d="M 62.30358,602.27884 L 82.5893,602.27884" 32.262 - id="path3012" 32.263 - inkscape:connector-type="polyline" /> 32.264 - <rect 32.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" 32.266 - id="rect3034" 32.267 - width="51.42857" 32.268 - height="20" 32.269 - x="228.51787" 32.270 - y="653.07648" /> 32.271 - <rect 32.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" 32.273 - id="rect3038" 32.274 - width="51.42857" 32.275 - height="20" 32.276 - x="155.80357" 32.277 - y="653.07648" /> 32.278 - <rect 32.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" 32.280 - id="rect3040" 32.281 - width="51.42857" 32.282 - height="20" 32.283 - x="83.089287" 32.284 - y="653.07648" /> 32.285 - <path 32.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" 32.287 - d="M 135.01786,663.07646 L 155.30359,663.07646" 32.288 - id="path3042" 32.289 - inkscape:connector-type="polyline" /> 32.290 - <path 32.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" 32.292 - d="M 207.73216,663.07646 L 228.01788,663.07646" 32.293 - id="path3044" 32.294 - inkscape:connector-type="polyline" /> 32.295 - <path 32.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" 32.297 - d="M 62.30358,663.07646 L 82.5893,663.07646" 32.298 - id="path3048" 32.299 - inkscape:connector-type="polyline" /> 32.300 - <text 32.301 - xml:space="preserve" 32.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" 32.303 - x="82.072548" 32.304 - y="432.64789" 32.305 - id="text3094"><tspan 32.306 - sodipodi:role="line" 32.307 - id="tspan3096" 32.308 - x="82.072548" 32.309 - y="432.64789">Changelog</tspan></text> 32.310 - <text 32.311 - xml:space="preserve" 32.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" 32.313 - x="82.306923" 32.314 - y="498.97327" 32.315 - id="text3098"><tspan 32.316 - sodipodi:role="line" 32.317 - id="tspan3100" 32.318 - x="82.306923" 32.319 - y="498.97327">Manifest</tspan></text> 32.320 - <text 32.321 - xml:space="preserve" 32.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" 32.323 - x="82.14286" 32.324 - y="580.08569" 32.325 - id="text3102"><tspan 32.326 - sodipodi:role="line" 32.327 - id="tspan3104" 32.328 - x="82.14286" 32.329 - y="580.08569">Filelogs</tspan></text> 32.330 - </g> 32.331 -</svg>
33.1 --- a/en/mq-stack.svg Tue Mar 10 21:42:19 2009 -0700 33.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 33.3 @@ -1,270 +0,0 @@ 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://inkscape.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.43" 33.19 - sodipodi:docname="mq-stack.svg" 33.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 33.21 - <defs 33.22 - id="defs4" /> 33.23 - <sodipodi:namedview 33.24 - id="base" 33.25 - pagecolor="#ffffff" 33.26 - bordercolor="#666666" 33.27 - borderopacity="1.0" 33.28 - inkscape:pageopacity="0.0" 33.29 - inkscape:pageshadow="2" 33.30 - inkscape:zoom="1.4142136" 33.31 - inkscape:cx="299.33323" 33.32 - inkscape:cy="815.646" 33.33 - inkscape:document-units="px" 33.34 - inkscape:current-layer="layer1" 33.35 - inkscape:window-width="1014" 33.36 - inkscape:window-height="689" 33.37 - inkscape:window-x="0" 33.38 - inkscape:window-y="25" /> 33.39 - <metadata 33.40 - id="metadata7"> 33.41 - <rdf:RDF> 33.42 - <cc:Work 33.43 - rdf:about=""> 33.44 - <dc:format>image/svg+xml</dc:format> 33.45 - <dc:type 33.46 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 33.47 - </cc:Work> 33.48 - </rdf:RDF> 33.49 - </metadata> 33.50 - <g 33.51 - inkscape:label="Layer 1" 33.52 - inkscape:groupmode="layer" 33.53 - id="layer1"> 33.54 - <rect 33.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" 33.56 - id="rect1307" 33.57 - width="202.93683" 33.58 - height="24.243662" 33.59 - x="230.01944" 33.60 - y="221.70146" /> 33.61 - <text 33.62 - xml:space="preserve" 33.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" 33.64 - x="237.89606" 33.65 - y="237.13383" 33.66 - id="text1309"><tspan 33.67 - sodipodi:role="line" 33.68 - id="tspan1311" 33.69 - x="237.89606" 33.70 - y="237.13383">prevent-compiler-reorder.patch</tspan></text> 33.71 - <rect 33.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" 33.73 - id="rect1320" 33.74 - width="202.93683" 33.75 - height="24.243662" 33.76 - x="230.01936" 33.77 - y="251.34325" /> 33.78 - <text 33.79 - xml:space="preserve" 33.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" 33.81 - x="237.89598" 33.82 - y="266.77563" 33.83 - id="text1322"><tspan 33.84 - sodipodi:role="line" 33.85 - id="tspan1324" 33.86 - x="237.89598" 33.87 - y="266.77563">namespace-cleanup.patch</tspan></text> 33.88 - <rect 33.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" 33.90 - id="rect2217" 33.91 - width="202.93683" 33.92 - height="24.243662" 33.93 - x="230.01936" 33.94 - y="280.98505" /> 33.95 - <text 33.96 - xml:space="preserve" 33.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" 33.98 - x="237.89598" 33.99 - y="296.41742" 33.100 - id="text2219"><tspan 33.101 - sodipodi:role="line" 33.102 - id="tspan2221" 33.103 - x="237.89598" 33.104 - y="296.41742">powerpc-port-fixes.patch</tspan></text> 33.105 - <rect 33.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" 33.107 - id="rect3114" 33.108 - width="202.93683" 33.109 - height="24.243662" 33.110 - x="230.01936" 33.111 - y="310.6268" /> 33.112 - <text 33.113 - xml:space="preserve" 33.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" 33.115 - x="237.89598" 33.116 - y="326.05917" 33.117 - id="text3116"><tspan 33.118 - sodipodi:role="line" 33.119 - id="tspan3118" 33.120 - x="237.89598" 33.121 - y="326.05917">report-devinfo-correctly.patch</tspan></text> 33.122 - <text 33.123 - xml:space="preserve" 33.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" 33.125 - x="200.01021" 33.126 - y="191.68094" 33.127 - id="text3170" 33.128 - sodipodi:linespacing="125%"><tspan 33.129 - sodipodi:role="line" 33.130 - id="tspan3172" 33.131 - x="200.01021" 33.132 - y="191.68094" 33.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> 33.134 - <text 33.135 - xml:space="preserve" 33.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" 33.137 - x="255.26627" 33.138 - y="248.79449" 33.139 - id="text3190" 33.140 - sodipodi:linespacing="125%" 33.141 - transform="scale(0.786716,1.271107)"><tspan 33.142 - sodipodi:role="line" 33.143 - id="tspan3192" 33.144 - x="255.26627" 33.145 - y="248.79449" 33.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> 33.147 - <text 33.148 - xml:space="preserve" 33.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" 33.150 - x="195.86807" 33.151 - y="173.17117" 33.152 - id="text4085" 33.153 - sodipodi:linespacing="125%"><tspan 33.154 - sodipodi:role="line" 33.155 - id="tspan4087" 33.156 - x="195.86807" 33.157 - y="173.17117" 33.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 33.159 - sodipodi:role="line" 33.160 - x="195.86807" 33.161 - y="188.17117" 33.162 - id="tspan4089" 33.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> 33.164 - <text 33.165 - xml:space="preserve" 33.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" 33.167 - x="195.0712" 33.168 - y="288.91745" 33.169 - id="text4091" 33.170 - sodipodi:linespacing="125%"><tspan 33.171 - sodipodi:role="line" 33.172 - id="tspan4093" 33.173 - x="195.0712" 33.174 - y="288.91745" 33.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 33.176 - sodipodi:role="line" 33.177 - x="195.0712" 33.178 - y="303.91745" 33.179 - id="tspan4111" 33.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> 33.181 - <text 33.182 - xml:space="preserve" 33.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" 33.184 - x="195.0712" 33.185 - y="229.28813" 33.186 - id="text4095" 33.187 - sodipodi:linespacing="125%"><tspan 33.188 - sodipodi:role="line" 33.189 - id="tspan4097" 33.190 - x="195.0712" 33.191 - y="229.28813" 33.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 33.193 - sodipodi:role="line" 33.194 - x="195.0712" 33.195 - y="244.28813" 33.196 - id="tspan4109" 33.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> 33.198 - <text 33.199 - xml:space="preserve" 33.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" 33.201 - x="450.4975" 33.202 - y="238.29692" 33.203 - id="text4137"><tspan 33.204 - sodipodi:role="line" 33.205 - id="tspan4139" 33.206 - x="450.4975" 33.207 - y="238.29692">201ad3209902</tspan></text> 33.208 - <text 33.209 - xml:space="preserve" 33.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" 33.211 - x="450.05804" 33.212 - y="267.93872" 33.213 - id="text4141"><tspan 33.214 - sodipodi:role="line" 33.215 - id="tspan4143" 33.216 - x="450.05804" 33.217 - y="267.93872">126b84e593ae</tspan></text> 33.218 - <text 33.219 - xml:space="preserve" 33.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" 33.221 - x="450.6557" 33.222 - y="297.58051" 33.223 - id="text4145"><tspan 33.224 - sodipodi:role="line" 33.225 - id="tspan4147" 33.226 - x="450.6557" 33.227 - y="297.58051">a655daf15409</tspan></text> 33.228 - <text 33.229 - xml:space="preserve" 33.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" 33.231 - x="450.71429" 33.232 - y="327.22226" 33.233 - id="text4149"><tspan 33.234 - sodipodi:role="line" 33.235 - id="tspan4151" 33.236 - x="450.71429" 33.237 - y="327.22226">e50d59aaea3a</tspan></text> 33.238 - <rect 33.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" 33.240 - id="rect3106" 33.241 - width="202.93683" 33.242 - height="24.243662" 33.243 - x="230.01936" 33.244 - y="150.41792" /> 33.245 - <text 33.246 - xml:space="preserve" 33.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" 33.248 - x="237.89598" 33.249 - y="165.8503" 33.250 - id="text3108"><tspan 33.251 - sodipodi:role="line" 33.252 - id="tspan3110" 33.253 - x="237.89598" 33.254 - y="165.8503">forbid-illegal-params.patch</tspan></text> 33.255 - <rect 33.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" 33.257 - id="rect2241" 33.258 - width="202.93683" 33.259 - height="24.243662" 33.260 - x="230.16466" 33.261 - y="180.05968" /> 33.262 - <text 33.263 - xml:space="preserve" 33.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" 33.265 - x="238.04128" 33.266 - y="195.49205" 33.267 - id="text2243"><tspan 33.268 - sodipodi:role="line" 33.269 - id="tspan2245" 33.270 - x="238.04128" 33.271 - y="195.49205">fix-memory-leak.patch</tspan></text> 33.272 - </g> 33.273 -</svg>
34.1 Binary file en/note.png has changed
35.1 --- a/en/revlog.svg Tue Mar 10 21:42:19 2009 -0700 35.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 35.3 @@ -1,1155 +0,0 @@ 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:xlink="http://www.w3.org/1999/xlink" 35.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 35.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 35.15 - width="744.09448819" 35.16 - height="1052.3622047" 35.17 - id="svg2" 35.18 - sodipodi:version="0.32" 35.19 - inkscape:version="0.44.1" 35.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 35.21 - sodipodi:docname="revlog.svg"> 35.22 - <defs 35.23 - id="defs4"> 35.24 - <marker 35.25 - inkscape:stockid="Arrow1Mend" 35.26 - orient="auto" 35.27 - refY="0.0" 35.28 - refX="0.0" 35.29 - id="Arrow1Mend" 35.30 - style="overflow:visible;"> 35.31 - <path 35.32 - id="path4852" 35.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 " 35.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 35.35 - transform="scale(0.4) rotate(180) translate(10,0)" /> 35.36 - </marker> 35.37 - <linearGradient 35.38 - id="linearGradient3092"> 35.39 - <stop 35.40 - style="stop-color:#44436f;stop-opacity:1;" 35.41 - offset="0" 35.42 - id="stop3094" /> 35.43 - <stop 35.44 - style="stop-color:#abade5;stop-opacity:1;" 35.45 - offset="1" 35.46 - id="stop3096" /> 35.47 - </linearGradient> 35.48 - <linearGradient 35.49 - inkscape:collect="always" 35.50 - xlink:href="#linearGradient3092" 35.51 - id="linearGradient3118" 35.52 - gradientUnits="userSpaceOnUse" 35.53 - x1="176.16635" 35.54 - y1="405.21934" 35.55 - x2="417.11935" 35.56 - y2="405.21934" /> 35.57 - <linearGradient 35.58 - inkscape:collect="always" 35.59 - xlink:href="#linearGradient3092" 35.60 - id="linearGradient3120" 35.61 - gradientUnits="userSpaceOnUse" 35.62 - x1="176.16635" 35.63 - y1="405.21934" 35.64 - x2="417.11935" 35.65 - y2="405.21934" /> 35.66 - <linearGradient 35.67 - inkscape:collect="always" 35.68 - xlink:href="#linearGradient3092" 35.69 - id="linearGradient3129" 35.70 - gradientUnits="userSpaceOnUse" 35.71 - x1="176.16635" 35.72 - y1="405.21934" 35.73 - x2="417.11935" 35.74 - y2="405.21934" 35.75 - gradientTransform="translate(-0.928574,-1.428574)" /> 35.76 - <linearGradient 35.77 - inkscape:collect="always" 35.78 - xlink:href="#linearGradient3092" 35.79 - id="linearGradient3133" 35.80 - gradientUnits="userSpaceOnUse" 35.81 - x1="176.16635" 35.82 - y1="405.21934" 35.83 - x2="417.11935" 35.84 - y2="405.21934" 35.85 - gradientTransform="translate(-0.928574,-1.428574)" /> 35.86 - <linearGradient 35.87 - inkscape:collect="always" 35.88 - xlink:href="#linearGradient3092" 35.89 - id="linearGradient3708" 35.90 - gradientUnits="userSpaceOnUse" 35.91 - gradientTransform="matrix(0.423343,0,0,0.423343,138.874,-67.01732)" 35.92 - x1="175.23776" 35.93 - y1="509.98154" 35.94 - x2="416.29077" 35.95 - y2="297.49997" /> 35.96 - <linearGradient 35.97 - inkscape:collect="always" 35.98 - xlink:href="#linearGradient3092" 35.99 - id="linearGradient5164" 35.100 - gradientUnits="userSpaceOnUse" 35.101 - gradientTransform="matrix(0.423343,0,0,0.423343,198.249,247.4358)" 35.102 - x1="175.23776" 35.103 - y1="509.98154" 35.104 - x2="416.29077" 35.105 - y2="297.49997" /> 35.106 - <linearGradient 35.107 - inkscape:collect="always" 35.108 - xlink:href="#linearGradient3092" 35.109 - id="linearGradient5584" 35.110 - gradientUnits="userSpaceOnUse" 35.111 - gradientTransform="matrix(0.423343,0,0,0.423343,143.9081,371.2915)" 35.112 - x1="175.23776" 35.113 - y1="509.98154" 35.114 - x2="416.29077" 35.115 - y2="297.49997" /> 35.116 - <linearGradient 35.117 - inkscape:collect="always" 35.118 - xlink:href="#linearGradient3092" 35.119 - id="linearGradient5784" 35.120 - gradientUnits="userSpaceOnUse" 35.121 - gradientTransform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 35.122 - x1="175.23776" 35.123 - y1="509.98154" 35.124 - x2="416.29077" 35.125 - y2="297.49997" /> 35.126 - <linearGradient 35.127 - inkscape:collect="always" 35.128 - xlink:href="#linearGradient3092" 35.129 - id="linearGradient5786" 35.130 - gradientUnits="userSpaceOnUse" 35.131 - gradientTransform="matrix(0.423343,0,0,0.423343,198.249,152.137)" 35.132 - x1="175.23776" 35.133 - y1="509.98154" 35.134 - x2="416.29077" 35.135 - y2="297.49997" /> 35.136 - <linearGradient 35.137 - inkscape:collect="always" 35.138 - xlink:href="#linearGradient3092" 35.139 - id="linearGradient5895" 35.140 - gradientUnits="userSpaceOnUse" 35.141 - gradientTransform="matrix(0.423343,0,0,0.423343,198.0215,261.7142)" 35.142 - x1="175.23776" 35.143 - y1="509.98154" 35.144 - x2="416.29077" 35.145 - y2="297.49997" /> 35.146 - <linearGradient 35.147 - inkscape:collect="always" 35.148 - xlink:href="#linearGradient3092" 35.149 - id="linearGradient5958" 35.150 - gradientUnits="userSpaceOnUse" 35.151 - gradientTransform="matrix(0.423343,0,0,0.423343,137.1978,42.55987)" 35.152 - x1="175.23776" 35.153 - y1="509.98154" 35.154 - x2="416.29077" 35.155 - y2="297.49997" /> 35.156 - </defs> 35.157 - <sodipodi:namedview 35.158 - id="base" 35.159 - pagecolor="#ffffff" 35.160 - bordercolor="#666666" 35.161 - borderopacity="1.0" 35.162 - gridtolerance="10000" 35.163 - guidetolerance="10" 35.164 - objecttolerance="10" 35.165 - inkscape:pageopacity="0.0" 35.166 - inkscape:pageshadow="2" 35.167 - inkscape:zoom="0.64" 35.168 - inkscape:cx="566.02368" 35.169 - inkscape:cy="688.16826" 35.170 - inkscape:document-units="px" 35.171 - inkscape:current-layer="layer1" 35.172 - inkscape:window-width="906" 35.173 - inkscape:window-height="620" 35.174 - inkscape:window-x="29" 35.175 - inkscape:window-y="79" 35.176 - inkscape:connector-spacing="11" /> 35.177 - <metadata 35.178 - id="metadata7"> 35.179 - <rdf:RDF> 35.180 - <cc:Work 35.181 - rdf:about=""> 35.182 - <dc:format>image/svg+xml</dc:format> 35.183 - <dc:type 35.184 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 35.185 - </cc:Work> 35.186 - </rdf:RDF> 35.187 - </metadata> 35.188 - <g 35.189 - inkscape:label="Layer 1" 35.190 - inkscape:groupmode="layer" 35.191 - id="layer1"> 35.192 - <rect 35.193 - y="168.74846" 35.194 - x="211.58516" 35.195 - height="89.506805" 35.196 - width="101.60232" 35.197 - id="rect3068" 35.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" /> 35.199 - <g 35.200 - id="g3215" 35.201 - transform="matrix(0.423343,0,0,0.423343,137.1977,42.55985)"> 35.202 - <rect 35.203 - y="447.71451" 35.204 - x="299.67859" 35.205 - height="48.571426" 35.206 - width="103.14286" 35.207 - id="rect2899" 35.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" /> 35.209 - <text 35.210 - id="text2903" 35.211 - y="464.8139" 35.212 - x="308.89639" 35.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" 35.214 - xml:space="preserve"><tspan 35.215 - y="464.8139" 35.216 - x="308.89639" 35.217 - sodipodi:role="line" 35.218 - id="tspan2905">Second parent</tspan></text> 35.219 - <text 35.220 - id="text2907" 35.221 - y="485.50256" 35.222 - x="308.20175" 35.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" 35.224 - xml:space="preserve"><tspan 35.225 - style="font-family:Courier" 35.226 - y="485.50256" 35.227 - x="308.20175" 35.228 - id="tspan2909" 35.229 - sodipodi:role="line">32bf9a5f22c0</tspan></text> 35.230 - </g> 35.231 - <g 35.232 - id="g3250" 35.233 - transform="matrix(0.423343,0,0,0.423343,137.1977,42.55986)"> 35.234 - <rect 35.235 - y="311.28598" 35.236 - x="188.6071" 35.237 - height="48.571426" 35.238 - width="103.14286" 35.239 - id="rect2936" 35.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" /> 35.241 - <text 35.242 - id="text2940" 35.243 - y="328.38538" 35.244 - x="197.82495" 35.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" 35.246 - xml:space="preserve"><tspan 35.247 - y="328.38538" 35.248 - x="197.82495" 35.249 - sodipodi:role="line" 35.250 - id="tspan2942">Revision hash</tspan></text> 35.251 - <text 35.252 - id="text2944" 35.253 - y="349.07404" 35.254 - x="197.13031" 35.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" 35.256 - xml:space="preserve"><tspan 35.257 - style="font-family:Courier" 35.258 - y="349.07404" 35.259 - x="197.13031" 35.260 - id="tspan2946" 35.261 - sodipodi:role="line">34b8b7a15ea1</tspan></text> 35.262 - </g> 35.263 - <g 35.264 - id="g3243" 35.265 - transform="matrix(0.423343,0,0,0.423343,137.6664,43.91853)"> 35.266 - <rect 35.267 - y="363.07654" 35.268 - x="187.5" 35.269 - height="75" 35.270 - width="213.85715" 35.271 - id="rect2950" 35.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" /> 35.273 - <text 35.274 - id="text2958" 35.275 - y="400.86459" 35.276 - x="196.02321" 35.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" 35.278 - xml:space="preserve"><tspan 35.279 - style="fill:black;fill-opacity:1;font-family:Courier" 35.280 - y="400.86459" 35.281 - x="196.02321" 35.282 - id="tspan2960" 35.283 - sodipodi:role="line">...</tspan></text> 35.284 - <text 35.285 - id="text2954" 35.286 - y="380.17593" 35.287 - x="196.71785" 35.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" 35.289 - xml:space="preserve"><tspan 35.290 - y="380.17593" 35.291 - x="196.71785" 35.292 - sodipodi:role="line" 35.293 - id="tspan2956" 35.294 - style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 35.295 - </g> 35.296 - <g 35.297 - id="g5529" 35.298 - transform="translate(-6.710312,-8.165836e-6)"> 35.299 - <rect 35.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" 35.301 - id="rect3509" 35.302 - width="101.60232" 35.303 - height="89.506805" 35.304 - x="218.29547" 35.305 - y="497.4801" /> 35.306 - <g 35.307 - transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 35.308 - id="g3513"> 35.309 - <g 35.310 - id="g3515"> 35.311 - <rect 35.312 - y="447.72418" 35.313 - x="188.6071" 35.314 - height="48.571426" 35.315 - width="103.14286" 35.316 - id="rect3517" 35.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" /> 35.318 - <text 35.319 - id="text3519" 35.320 - y="464.82358" 35.321 - x="197.82495" 35.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" 35.323 - xml:space="preserve"><tspan 35.324 - y="464.82358" 35.325 - x="197.82495" 35.326 - sodipodi:role="line" 35.327 - id="tspan3521">First parent</tspan></text> 35.328 - <text 35.329 - id="text3523" 35.330 - y="485.51224" 35.331 - x="197.13031" 35.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" 35.333 - xml:space="preserve"><tspan 35.334 - style="font-family:Courier" 35.335 - y="485.51224" 35.336 - x="197.13031" 35.337 - id="tspan3525" 35.338 - sodipodi:role="line">000000000000</tspan></text> 35.339 - </g> 35.340 - <g 35.341 - id="g3527"> 35.342 - <rect 35.343 - y="447.71451" 35.344 - x="299.67859" 35.345 - height="48.571426" 35.346 - width="103.14286" 35.347 - id="rect3529" 35.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" /> 35.349 - <text 35.350 - id="text3531" 35.351 - y="464.8139" 35.352 - x="308.89639" 35.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" 35.354 - xml:space="preserve"><tspan 35.355 - y="464.8139" 35.356 - x="308.89639" 35.357 - sodipodi:role="line" 35.358 - id="tspan3533">Second parent</tspan></text> 35.359 - <text 35.360 - id="text3535" 35.361 - y="485.50256" 35.362 - x="308.20175" 35.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" 35.364 - xml:space="preserve"><tspan 35.365 - style="font-family:Courier" 35.366 - y="485.50256" 35.367 - x="308.20175" 35.368 - id="tspan3537" 35.369 - sodipodi:role="line">000000000000</tspan></text> 35.370 - </g> 35.371 - </g> 35.372 - <g 35.373 - transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 35.374 - id="g3539"> 35.375 - <rect 35.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" 35.377 - id="rect3541" 35.378 - width="103.14286" 35.379 - height="48.571426" 35.380 - x="188.6071" 35.381 - y="311.28598" /> 35.382 - <text 35.383 - xml:space="preserve" 35.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" 35.385 - x="197.82495" 35.386 - y="328.38538" 35.387 - id="text3543"><tspan 35.388 - id="tspan3545" 35.389 - sodipodi:role="line" 35.390 - x="197.82495" 35.391 - y="328.38538">Revision hash</tspan></text> 35.392 - <text 35.393 - xml:space="preserve" 35.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" 35.395 - x="197.13031" 35.396 - y="349.07404" 35.397 - id="text3547"><tspan 35.398 - sodipodi:role="line" 35.399 - id="tspan3549" 35.400 - x="197.13031" 35.401 - y="349.07404" 35.402 - style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 35.403 - </g> 35.404 - <g 35.405 - transform="matrix(0.423343,0,0,0.423343,144.3767,372.6502)" 35.406 - id="g3551"> 35.407 - <rect 35.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" 35.409 - id="rect3553" 35.410 - width="213.85715" 35.411 - height="75" 35.412 - x="187.5" 35.413 - y="363.07654" /> 35.414 - <text 35.415 - xml:space="preserve" 35.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" 35.417 - x="196.02321" 35.418 - y="400.86459" 35.419 - id="text3555"><tspan 35.420 - sodipodi:role="line" 35.421 - id="tspan3557" 35.422 - x="196.02321" 35.423 - y="400.86459" 35.424 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 35.425 - <text 35.426 - xml:space="preserve" 35.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" 35.428 - x="196.71785" 35.429 - y="380.17593" 35.430 - id="text3559"><tspan 35.431 - style="fill:black;fill-opacity:1" 35.432 - id="tspan3561" 35.433 - sodipodi:role="line" 35.434 - x="196.71785" 35.435 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 35.436 - </g> 35.437 - </g> 35.438 - <g 35.439 - id="g4868" 35.440 - transform="translate(-1.676208,-2.342463e-5)"> 35.441 - <rect 35.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" 35.443 - id="rect3567" 35.444 - width="101.60232" 35.445 - height="89.506805" 35.446 - x="213.26137" 35.447 - y="59.171272" /> 35.448 - <g 35.449 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 35.450 - id="g3573"> 35.451 - <rect 35.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" 35.453 - id="rect3575" 35.454 - width="103.14286" 35.455 - height="48.571426" 35.456 - x="188.6071" 35.457 - y="447.72418" /> 35.458 - <text 35.459 - xml:space="preserve" 35.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" 35.461 - x="197.82495" 35.462 - y="464.82358" 35.463 - id="text3577"><tspan 35.464 - id="tspan3579" 35.465 - sodipodi:role="line" 35.466 - x="197.82495" 35.467 - y="464.82358">First parent</tspan></text> 35.468 - <text 35.469 - xml:space="preserve" 35.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" 35.471 - x="197.13031" 35.472 - y="485.51224" 35.473 - id="text3581"><tspan 35.474 - sodipodi:role="line" 35.475 - id="tspan3583" 35.476 - x="197.13031" 35.477 - y="485.51224" 35.478 - style="font-family:Courier">34b8b7a15ea1</tspan></text> 35.479 - </g> 35.480 - <g 35.481 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 35.482 - id="g3585"> 35.483 - <rect 35.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" 35.485 - id="rect3587" 35.486 - width="103.14286" 35.487 - height="48.571426" 35.488 - x="299.67859" 35.489 - y="447.71451" /> 35.490 - <text 35.491 - xml:space="preserve" 35.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" 35.493 - x="308.89639" 35.494 - y="464.8139" 35.495 - id="text3589"><tspan 35.496 - id="tspan3591" 35.497 - sodipodi:role="line" 35.498 - x="308.89639" 35.499 - y="464.8139">Second parent</tspan></text> 35.500 - <text 35.501 - xml:space="preserve" 35.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" 35.503 - x="308.20175" 35.504 - y="485.50256" 35.505 - id="text3593"><tspan 35.506 - sodipodi:role="line" 35.507 - id="tspan3595" 35.508 - x="308.20175" 35.509 - y="485.50256" 35.510 - style="font-family:Courier">000000000000</tspan></text> 35.511 - </g> 35.512 - <g 35.513 - transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01733)" 35.514 - id="g3597"> 35.515 - <rect 35.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" 35.517 - id="rect3599" 35.518 - width="103.14286" 35.519 - height="48.571426" 35.520 - x="188.6071" 35.521 - y="311.28598" /> 35.522 - <text 35.523 - xml:space="preserve" 35.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" 35.525 - x="197.82495" 35.526 - y="328.38538" 35.527 - id="text3601"><tspan 35.528 - id="tspan3603" 35.529 - sodipodi:role="line" 35.530 - x="197.82495" 35.531 - y="328.38538">Revision hash</tspan></text> 35.532 - <text 35.533 - xml:space="preserve" 35.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" 35.535 - x="197.13031" 35.536 - y="349.07404" 35.537 - id="text3605"><tspan 35.538 - sodipodi:role="line" 35.539 - id="tspan3607" 35.540 - x="197.13031" 35.541 - y="349.07404" 35.542 - style="font-family:Courier">1b67dc96f27a</tspan></text> 35.543 - </g> 35.544 - <g 35.545 - transform="matrix(0.423343,0,0,0.423343,139.3426,-65.65866)" 35.546 - id="g3609"> 35.547 - <rect 35.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" 35.549 - id="rect3611" 35.550 - width="213.85715" 35.551 - height="75" 35.552 - x="187.5" 35.553 - y="363.07654" /> 35.554 - <text 35.555 - xml:space="preserve" 35.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" 35.557 - x="196.02321" 35.558 - y="400.86459" 35.559 - id="text3613"><tspan 35.560 - sodipodi:role="line" 35.561 - id="tspan3615" 35.562 - x="196.02321" 35.563 - y="400.86459" 35.564 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 35.565 - <text 35.566 - xml:space="preserve" 35.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" 35.568 - x="196.71785" 35.569 - y="380.17593" 35.570 - id="text3617"><tspan 35.571 - style="fill:black;fill-opacity:1" 35.572 - id="tspan3619" 35.573 - sodipodi:role="line" 35.574 - x="196.71785" 35.575 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 35.576 - </g> 35.577 - </g> 35.578 - <path 35.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)" 35.580 - d="M 240.78255,143.08593 L 241.42595,171.75349" 35.581 - id="path3801" 35.582 - inkscape:connector-type="polyline" 35.583 - inkscape:connection-start="#g3573" 35.584 - inkscape:connection-end="#g3250" /> 35.585 - <g 35.586 - id="g5677"> 35.587 - <rect 35.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" 35.589 - id="rect3393" 35.590 - width="101.60232" 35.591 - height="89.506805" 35.592 - x="150.76137" 35.593 - y="278.32565" /> 35.594 - <g 35.595 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 35.596 - id="g3399"> 35.597 - <rect 35.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" 35.599 - id="rect3401" 35.600 - width="103.14286" 35.601 - height="48.571426" 35.602 - x="188.6071" 35.603 - y="447.72418" /> 35.604 - <text 35.605 - xml:space="preserve" 35.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" 35.607 - x="197.82495" 35.608 - y="464.82358" 35.609 - id="text3403"><tspan 35.610 - id="tspan3405" 35.611 - sodipodi:role="line" 35.612 - x="197.82495" 35.613 - y="464.82358">First parent</tspan></text> 35.614 - <text 35.615 - xml:space="preserve" 35.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" 35.617 - x="197.13031" 35.618 - y="485.51224" 35.619 - id="text3407"><tspan 35.620 - sodipodi:role="line" 35.621 - id="tspan3409" 35.622 - x="197.13031" 35.623 - y="485.51224" 35.624 - style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 35.625 - </g> 35.626 - <g 35.627 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 35.628 - id="g3411"> 35.629 - <rect 35.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" 35.631 - id="rect3413" 35.632 - width="103.14286" 35.633 - height="48.571426" 35.634 - x="299.67859" 35.635 - y="447.71451" /> 35.636 - <text 35.637 - xml:space="preserve" 35.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" 35.639 - x="308.89639" 35.640 - y="464.8139" 35.641 - id="text3415"><tspan 35.642 - id="tspan3417" 35.643 - sodipodi:role="line" 35.644 - x="308.89639" 35.645 - y="464.8139">Second parent</tspan></text> 35.646 - <text 35.647 - xml:space="preserve" 35.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" 35.649 - x="308.20175" 35.650 - y="485.50256" 35.651 - id="text3419"><tspan 35.652 - sodipodi:role="line" 35.653 - id="tspan3421" 35.654 - x="308.20175" 35.655 - y="485.50256" 35.656 - style="font-family:Courier">000000000000</tspan></text> 35.657 - </g> 35.658 - <g 35.659 - transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 35.660 - id="g3423"> 35.661 - <rect 35.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" 35.663 - id="rect3425" 35.664 - width="103.14286" 35.665 - height="48.571426" 35.666 - x="188.6071" 35.667 - y="311.28598" /> 35.668 - <text 35.669 - xml:space="preserve" 35.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" 35.671 - x="197.82495" 35.672 - y="328.38538" 35.673 - id="text3427"><tspan 35.674 - id="tspan3429" 35.675 - sodipodi:role="line" 35.676 - x="197.82495" 35.677 - y="328.38538">Revision hash</tspan></text> 35.678 - <text 35.679 - xml:space="preserve" 35.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" 35.681 - x="197.13031" 35.682 - y="349.07404" 35.683 - id="text3431"><tspan 35.684 - sodipodi:role="line" 35.685 - id="tspan3433" 35.686 - x="197.13031" 35.687 - y="349.07404" 35.688 - style="font-family:Courier">5b80c922ebdd</tspan></text> 35.689 - </g> 35.690 - <g 35.691 - transform="matrix(0.423343,0,0,0.423343,76.84265,153.4957)" 35.692 - id="g3435"> 35.693 - <rect 35.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" 35.695 - id="rect3437" 35.696 - width="213.85715" 35.697 - height="75" 35.698 - x="187.5" 35.699 - y="363.07654" /> 35.700 - <text 35.701 - xml:space="preserve" 35.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" 35.703 - x="196.02321" 35.704 - y="400.86459" 35.705 - id="text3439"><tspan 35.706 - sodipodi:role="line" 35.707 - id="tspan3441" 35.708 - x="196.02321" 35.709 - y="400.86459" 35.710 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 35.711 - <text 35.712 - xml:space="preserve" 35.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" 35.714 - x="196.71785" 35.715 - y="380.17593" 35.716 - id="text3443"><tspan 35.717 - style="fill:black;fill-opacity:1" 35.718 - id="tspan3445" 35.719 - sodipodi:role="line" 35.720 - x="196.71785" 35.721 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 35.722 - </g> 35.723 - </g> 35.724 - <g 35.725 - id="g5646" 35.726 - transform="translate(-0.227432,0)"> 35.727 - <rect 35.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" 35.729 - id="rect3451" 35.730 - width="101.60232" 35.731 - height="89.506805" 35.732 - x="272.63638" 35.733 - y="278.32565" /> 35.734 - <g 35.735 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 35.736 - id="g3457"> 35.737 - <rect 35.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" 35.739 - id="rect3459" 35.740 - width="103.14286" 35.741 - height="48.571426" 35.742 - x="188.6071" 35.743 - y="447.72418" /> 35.744 - <text 35.745 - xml:space="preserve" 35.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" 35.747 - x="197.82495" 35.748 - y="464.82358" 35.749 - id="text3461"><tspan 35.750 - id="tspan3463" 35.751 - sodipodi:role="line" 35.752 - x="197.82495" 35.753 - y="464.82358">First parent</tspan></text> 35.754 - <text 35.755 - xml:space="preserve" 35.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" 35.757 - x="197.13031" 35.758 - y="485.51224" 35.759 - id="text3465"><tspan 35.760 - sodipodi:role="line" 35.761 - id="tspan3467" 35.762 - x="197.13031" 35.763 - y="485.51224" 35.764 - style="font-family:Courier">ecacb6b4c9fd</tspan></text> 35.765 - </g> 35.766 - <g 35.767 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 35.768 - id="g3469"> 35.769 - <rect 35.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" 35.771 - id="rect3471" 35.772 - width="103.14286" 35.773 - height="48.571426" 35.774 - x="299.67859" 35.775 - y="447.71451" /> 35.776 - <text 35.777 - xml:space="preserve" 35.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" 35.779 - x="308.89639" 35.780 - y="464.8139" 35.781 - id="text3473"><tspan 35.782 - id="tspan3475" 35.783 - sodipodi:role="line" 35.784 - x="308.89639" 35.785 - y="464.8139">Second parent</tspan></text> 35.786 - <text 35.787 - xml:space="preserve" 35.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" 35.789 - x="308.20175" 35.790 - y="485.50256" 35.791 - id="text3477"><tspan 35.792 - sodipodi:role="line" 35.793 - id="tspan3479" 35.794 - x="308.20175" 35.795 - y="485.50256" 35.796 - style="font-family:Courier">000000000000</tspan></text> 35.797 - </g> 35.798 - <g 35.799 - transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 35.800 - id="g3481"> 35.801 - <rect 35.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" 35.803 - id="rect3483" 35.804 - width="103.14286" 35.805 - height="48.571426" 35.806 - x="188.6071" 35.807 - y="311.28598" /> 35.808 - <text 35.809 - xml:space="preserve" 35.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" 35.811 - x="197.82495" 35.812 - y="328.38538" 35.813 - id="text3485"><tspan 35.814 - id="tspan3487" 35.815 - sodipodi:role="line" 35.816 - x="197.82495" 35.817 - y="328.38538">Revision hash</tspan></text> 35.818 - <text 35.819 - xml:space="preserve" 35.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" 35.821 - x="197.13031" 35.822 - y="349.07404" 35.823 - id="text3489"><tspan 35.824 - sodipodi:role="line" 35.825 - id="tspan3491" 35.826 - x="197.13031" 35.827 - y="349.07404" 35.828 - style="font-family:Courier">32bf9a5f22c0</tspan></text> 35.829 - </g> 35.830 - <g 35.831 - transform="matrix(0.423343,0,0,0.423343,198.7176,153.4957)" 35.832 - id="g3493"> 35.833 - <rect 35.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" 35.835 - id="rect3495" 35.836 - width="213.85715" 35.837 - height="75" 35.838 - x="187.5" 35.839 - y="363.07654" /> 35.840 - <text 35.841 - xml:space="preserve" 35.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" 35.843 - x="196.02321" 35.844 - y="400.86459" 35.845 - id="text3497"><tspan 35.846 - sodipodi:role="line" 35.847 - id="tspan3499" 35.848 - x="196.02321" 35.849 - y="400.86459" 35.850 - style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 35.851 - <text 35.852 - xml:space="preserve" 35.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" 35.854 - x="196.71785" 35.855 - y="380.17593" 35.856 - id="text3501"><tspan 35.857 - style="fill:black;fill-opacity:1" 35.858 - id="tspan3503" 35.859 - sodipodi:role="line" 35.860 - x="196.71785" 35.861 - y="380.17593">Revision data (delta or snapshot)</tspan></text> 35.862 - </g> 35.863 - </g> 35.864 - <rect 35.865 - y="387.90286" 35.866 - x="272.40894" 35.867 - height="89.506805" 35.868 - width="101.60232" 35.869 - id="rect5081" 35.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" /> 35.871 - <g 35.872 - id="g5087" 35.873 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 35.874 - <rect 35.875 - y="447.72418" 35.876 - x="188.6071" 35.877 - height="48.571426" 35.878 - width="103.14286" 35.879 - id="rect5089" 35.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" /> 35.881 - <text 35.882 - id="text5091" 35.883 - y="464.82358" 35.884 - x="197.82495" 35.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" 35.886 - xml:space="preserve"><tspan 35.887 - y="464.82358" 35.888 - x="197.82495" 35.889 - sodipodi:role="line" 35.890 - id="tspan5093">First parent</tspan></text> 35.891 - <text 35.892 - id="text5095" 35.893 - y="485.51224" 35.894 - x="197.13031" 35.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" 35.896 - xml:space="preserve"><tspan 35.897 - style="font-family:Courier" 35.898 - y="485.51224" 35.899 - x="197.13031" 35.900 - id="tspan5097" 35.901 - sodipodi:role="line">ff9dc8bc2a8b</tspan></text> 35.902 - </g> 35.903 - <g 35.904 - id="g5099" 35.905 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 35.906 - <rect 35.907 - y="447.71451" 35.908 - x="299.67859" 35.909 - height="48.571426" 35.910 - width="103.14286" 35.911 - id="rect5101" 35.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" /> 35.913 - <text 35.914 - id="text5103" 35.915 - y="464.8139" 35.916 - x="308.89639" 35.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" 35.918 - xml:space="preserve"><tspan 35.919 - y="464.8139" 35.920 - x="308.89639" 35.921 - sodipodi:role="line" 35.922 - id="tspan5105">Second parent</tspan></text> 35.923 - <text 35.924 - id="text5107" 35.925 - y="485.50256" 35.926 - x="308.20175" 35.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" 35.928 - xml:space="preserve"><tspan 35.929 - style="font-family:Courier" 35.930 - y="485.50256" 35.931 - x="308.20175" 35.932 - id="tspan5109" 35.933 - sodipodi:role="line">000000000000</tspan></text> 35.934 - </g> 35.935 - <g 35.936 - id="g5111" 35.937 - transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 35.938 - <rect 35.939 - y="311.28598" 35.940 - x="188.6071" 35.941 - height="48.571426" 35.942 - width="103.14286" 35.943 - id="rect5113" 35.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" /> 35.945 - <text 35.946 - id="text5115" 35.947 - y="328.38538" 35.948 - x="197.82495" 35.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" 35.950 - xml:space="preserve"><tspan 35.951 - y="328.38538" 35.952 - x="197.82495" 35.953 - sodipodi:role="line" 35.954 - id="tspan5117">Revision hash</tspan></text> 35.955 - <text 35.956 - id="text5119" 35.957 - y="349.07404" 35.958 - x="197.13031" 35.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" 35.960 - xml:space="preserve"><tspan 35.961 - style="font-family:Courier" 35.962 - y="349.07404" 35.963 - x="197.13031" 35.964 - id="tspan5121" 35.965 - sodipodi:role="line">ecacb6b4c9fd</tspan></text> 35.966 - </g> 35.967 - <g 35.968 - id="g5123" 35.969 - transform="matrix(0.423343,0,0,0.423343,198.4901,263.0729)"> 35.970 - <rect 35.971 - y="363.07654" 35.972 - x="187.5" 35.973 - height="75" 35.974 - width="213.85715" 35.975 - id="rect5125" 35.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" /> 35.977 - <text 35.978 - id="text5127" 35.979 - y="400.86459" 35.980 - x="196.02321" 35.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" 35.982 - xml:space="preserve"><tspan 35.983 - style="fill:black;fill-opacity:1;font-family:Courier" 35.984 - y="400.86459" 35.985 - x="196.02321" 35.986 - id="tspan5129" 35.987 - sodipodi:role="line">...</tspan></text> 35.988 - <text 35.989 - id="text5131" 35.990 - y="380.17593" 35.991 - x="196.71785" 35.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" 35.993 - xml:space="preserve"><tspan 35.994 - y="380.17593" 35.995 - x="196.71785" 35.996 - sodipodi:role="line" 35.997 - id="tspan5133" 35.998 - style="fill:black;fill-opacity:1">Revision data (delta or snapshot)</tspan></text> 35.999 - </g> 35.1000 - <path 35.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" 35.1002 - d="M 299.69935,362.24027 L 299.69931,393.49494" 35.1003 - id="path5203" 35.1004 - inkscape:connector-type="polyline" 35.1005 - inkscape:connection-start="#g3457" 35.1006 - inkscape:connection-end="#g5111" /> 35.1007 - <path 35.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" 35.1009 - d="M 182.35357,362.22647 L 241.2842,503.07224" 35.1010 - id="path5271" 35.1011 - inkscape:connector-type="polyline" 35.1012 - inkscape:connection-start="#g3399" 35.1013 - inkscape:connection-end="#g3539" /> 35.1014 - <path 35.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" 35.1016 - d="M 287.63109,471.81747 L 250.9438,503.07223" 35.1017 - id="path5285" 35.1018 - inkscape:connector-type="polyline" 35.1019 - inkscape:connection-start="#g5087" 35.1020 - inkscape:connection-end="#g3539" /> 35.1021 - <path 35.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)" 35.1023 - d="M 290.80419,250.07192 L 297.80065,283.90394" 35.1024 - id="path5077" 35.1025 - inkscape:connector-type="polyline" 35.1026 - inkscape:connection-start="#g3215" 35.1027 - inkscape:connection-end="#g3481" /> 35.1028 - <path 35.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)" 35.1030 - d="M 229.63373,250.07601 L 190.07484,283.90394" 35.1031 - id="path5075" 35.1032 - inkscape:connector-type="polyline" 35.1033 - inkscape:connection-end="#g3423" /> 35.1034 - <text 35.1035 - xml:space="preserve" 35.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" 35.1037 - x="131.5625" 35.1038 - y="100.79968" 35.1039 - id="text5897"><tspan 35.1040 - sodipodi:role="line" 35.1041 - id="tspan5899" 35.1042 - x="131.5625" 35.1043 - y="100.79968" 35.1044 - style="text-align:end;text-anchor:end">Head revision</tspan><tspan 35.1045 - sodipodi:role="line" 35.1046 - x="131.5625" 35.1047 - y="115.79968" 35.1048 - id="tspan5901" 35.1049 - style="text-align:end;text-anchor:end">(no children)</tspan></text> 35.1050 - <text 35.1051 - xml:space="preserve" 35.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" 35.1053 - x="131.5625" 35.1054 - y="207.04968" 35.1055 - id="text5903"><tspan 35.1056 - sodipodi:role="line" 35.1057 - id="tspan5905" 35.1058 - x="131.5625" 35.1059 - y="207.04968" 35.1060 - style="text-align:end;text-anchor:end">Merge revision</tspan><tspan 35.1061 - sodipodi:role="line" 35.1062 - x="131.5625" 35.1063 - y="222.04968" 35.1064 - id="tspan5907" 35.1065 - style="text-align:end;text-anchor:end">(two parents)</tspan></text> 35.1066 - <text 35.1067 - xml:space="preserve" 35.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" 35.1069 - x="131.92578" 35.1070 - y="451.58093" 35.1071 - id="text5909"><tspan 35.1072 - sodipodi:role="line" 35.1073 - id="tspan5911" 35.1074 - x="131.92578" 35.1075 - y="451.58093" 35.1076 - style="text-align:end;text-anchor:end">Branches</tspan><tspan 35.1077 - sodipodi:role="line" 35.1078 - x="131.92578" 35.1079 - y="466.58093" 35.1080 - id="tspan5913" 35.1081 - style="text-align:end;text-anchor:end">(two revisions,</tspan><tspan 35.1082 - sodipodi:role="line" 35.1083 - x="131.92578" 35.1084 - y="481.58093" 35.1085 - id="tspan5915" 35.1086 - style="text-align:end;text-anchor:end">same parent)</tspan></text> 35.1087 - <path 35.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" 35.1089 - d="M 111.71875,433.61218 L 154.7268,368.52294" 35.1090 - id="path5917" 35.1091 - inkscape:connector-type="polyline" /> 35.1092 - <path 35.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" 35.1094 - d="M 134.375,464.86218 L 277.86691,440.37816" 35.1095 - id="path5919" 35.1096 - inkscape:connector-type="polyline" 35.1097 - inkscape:connection-end="#g5123" /> 35.1098 - <text 35.1099 - xml:space="preserve" 35.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" 35.1101 - x="131.5625" 35.1102 - y="536.73718" 35.1103 - id="text5927"><tspan 35.1104 - sodipodi:role="line" 35.1105 - id="tspan5929" 35.1106 - x="131.5625" 35.1107 - y="536.73718">First revision</tspan><tspan 35.1108 - sodipodi:role="line" 35.1109 - x="131.5625" 35.1110 - y="551.73718" 35.1111 - id="tspan5931">(both parents null)</tspan></text> 35.1112 - <rect 35.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" 35.1114 - id="rect2830" 35.1115 - width="43.664806" 35.1116 - height="20.562374" 35.1117 - x="217.0432" 35.1118 - y="232.10075" /> 35.1119 - <text 35.1120 - xml:space="preserve" 35.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" 35.1122 - x="220.94551" 35.1123 - y="239.33966" 35.1124 - id="text2832"><tspan 35.1125 - id="tspan2836" 35.1126 - sodipodi:role="line" 35.1127 - x="220.94551" 35.1128 - y="239.33966">First parent</tspan></text> 35.1129 - <text 35.1130 - xml:space="preserve" 35.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" 35.1132 - x="220.65144" 35.1133 - y="248.09805" 35.1134 - id="text2879"><tspan 35.1135 - sodipodi:role="line" 35.1136 - id="tspan2881" 35.1137 - x="220.65144" 35.1138 - y="248.09805" 35.1139 - style="font-family:Courier">5b80c922ebdd</tspan></text> 35.1140 - <path 35.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" 35.1142 - d="M 139.84375,107.83093 L 210.15625,107.83093" 35.1143 - id="path5965" 35.1144 - inkscape:connector-type="polyline" /> 35.1145 - <path 35.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" 35.1147 - d="M 137.5,213.29968 L 210.49036,214.09055" 35.1148 - id="path5967" 35.1149 - inkscape:connector-type="polyline" /> 35.1150 - <path 35.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" 35.1152 - d="M 136.34375,544.54968 L 206.65625,544.54968" 35.1153 - id="path5969" 35.1154 - inkscape:connector-type="polyline" 35.1155 - inkscape:transform-center-y="-171.09375" 35.1156 - inkscape:transform-center-x="53.90625" /> 35.1157 - </g> 35.1158 -</svg>
36.1 --- a/en/snapshot.svg Tue Mar 10 21:42:19 2009 -0700 36.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 36.3 @@ -1,202 +0,0 @@ 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="svg2807" 36.17 - sodipodi:version="0.32" 36.18 - inkscape:version="0.44.1" 36.19 - sodipodi:docbase="/home/bos/hg/hgbook/en" 36.20 - sodipodi:docname="snapshots.svg"> 36.21 - <defs 36.22 - id="defs2809" /> 36.23 - <sodipodi:namedview 36.24 - id="base" 36.25 - pagecolor="#ffffff" 36.26 - bordercolor="#666666" 36.27 - borderopacity="1.0" 36.28 - gridtolerance="10000" 36.29 - guidetolerance="10" 36.30 - objecttolerance="10" 36.31 - inkscape:pageopacity="0.0" 36.32 - inkscape:pageshadow="2" 36.33 - inkscape:zoom="1.4" 36.34 - inkscape:cx="252.04111" 36.35 - inkscape:cy="605.75448" 36.36 - inkscape:document-units="px" 36.37 - inkscape:current-layer="layer1" 36.38 - inkscape:window-width="906" 36.39 - inkscape:window-height="721" 36.40 - inkscape:window-x="0" 36.41 - inkscape:window-y="25" /> 36.42 - <metadata 36.43 - id="metadata2812"> 36.44 - <rdf:RDF> 36.45 - <cc:Work 36.46 - rdf:about=""> 36.47 - <dc:format>image/svg+xml</dc:format> 36.48 - <dc:type 36.49 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 36.50 - </cc:Work> 36.51 - </rdf:RDF> 36.52 - </metadata> 36.53 - <g 36.54 - inkscape:label="Layer 1" 36.55 - inkscape:groupmode="layer" 36.56 - id="layer1"> 36.57 - <rect 36.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" 36.59 - id="rect2817" 36.60 - width="118.18347" 36.61 - height="245.32632" 36.62 - x="243.05112" 36.63 - y="315.4133" 36.64 - inkscape:transform-center-x="136.84403" 36.65 - inkscape:transform-center-y="-66.529183" /> 36.66 - <rect 36.67 - y="315.04153" 36.68 - x="46.965065" 36.69 - height="97.803009" 36.70 - width="108.92702" 36.71 - id="rect2815" 36.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" /> 36.73 - <g 36.74 - id="g3814"> 36.75 - <rect 36.76 - y="348.94302" 36.77 - x="59.285713" 36.78 - height="30" 36.79 - width="84.285713" 36.80 - id="rect2819" 36.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" 36.82 - ry="0" /> 36.83 - <text 36.84 - id="text2821" 36.85 - y="368.02701" 36.86 - x="72.717636" 36.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" 36.88 - xml:space="preserve"><tspan 36.89 - y="368.02701" 36.90 - x="72.717636" 36.91 - id="tspan2823" 36.92 - sodipodi:role="line">Index, rev 7</tspan></text> 36.93 - </g> 36.94 - <text 36.95 - id="text3722" 36.96 - y="301.29074" 36.97 - x="46.187778" 36.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" 36.99 - xml:space="preserve"><tspan 36.100 - y="301.29074" 36.101 - x="46.187778" 36.102 - id="tspan3724" 36.103 - sodipodi:role="line">Revlog index (.i file)</tspan></text> 36.104 - <text 36.105 - id="text3726" 36.106 - y="301.29074" 36.107 - x="241.90207" 36.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" 36.109 - xml:space="preserve"><tspan 36.110 - y="301.29074" 36.111 - x="241.90207" 36.112 - id="tspan3728" 36.113 - sodipodi:role="line">Revlog data (.d file)</tspan></text> 36.114 - <path 36.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" 36.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 " 36.117 - id="path3839" 36.118 - sodipodi:nodetypes="ccccc" /> 36.119 - <rect 36.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" 36.121 - id="rect3752" 36.122 - width="92.720184" 36.123 - height="67.005905" 36.124 - x="255.42564" 36.125 - y="368.64264" /> 36.126 - <text 36.127 - xml:space="preserve" 36.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" 36.129 - x="264.45859" 36.130 - y="387.30099" 36.131 - id="text3754"><tspan 36.132 - sodipodi:role="line" 36.133 - id="tspan3756" 36.134 - x="264.45859" 36.135 - y="387.30099">Snapshot, rev 4</tspan></text> 36.136 - <rect 36.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" 36.138 - id="rect3761" 36.139 - width="93.49366" 36.140 - height="29.922237" 36.141 - x="255.03891" 36.142 - y="442.04395" /> 36.143 - <text 36.144 - xml:space="preserve" 36.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" 36.146 - x="263.2662" 36.147 - y="460.17206" 36.148 - id="text3763"><tspan 36.149 - sodipodi:role="line" 36.150 - id="tspan3765" 36.151 - x="263.2662" 36.152 - y="460.17206">Delta, rev 4 to 5</tspan></text> 36.153 - <rect 36.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" 36.155 - id="rect3774" 36.156 - width="93.49366" 36.157 - height="29.922237" 36.158 - x="255.03891" 36.159 - y="477.97485" /> 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:Times New Roman" 36.163 - x="263.2662" 36.164 - y="496.10297" 36.165 - id="text3776"><tspan 36.166 - sodipodi:role="line" 36.167 - id="tspan3778" 36.168 - x="263.2662" 36.169 - y="496.10297">Delta, rev 5 to 6</tspan></text> 36.170 - <rect 36.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" 36.172 - id="rect3782" 36.173 - width="93.49366" 36.174 - height="29.922237" 36.175 - x="255.03891" 36.176 - y="513.90576" /> 36.177 - <text 36.178 - xml:space="preserve" 36.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" 36.180 - x="263.2662" 36.181 - y="532.03387" 36.182 - id="text3784"><tspan 36.183 - sodipodi:role="line" 36.184 - id="tspan3786" 36.185 - x="263.2662" 36.186 - y="532.03387">Delta, rev 6 to 7</tspan></text> 36.187 - <rect 36.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" 36.189 - id="rect3889" 36.190 - width="93.49366" 36.191 - height="29.922237" 36.192 - x="255.03891" 36.193 - y="332.32489" /> 36.194 - <text 36.195 - xml:space="preserve" 36.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" 36.197 - x="263.2662" 36.198 - y="350.453" 36.199 - id="text3891"><tspan 36.200 - sodipodi:role="line" 36.201 - id="tspan3893" 36.202 - x="263.2662" 36.203 - y="350.453">Delta, rev 2 to 3</tspan></text> 36.204 - </g> 36.205 -</svg>
37.1 --- a/en/tour-history.svg Tue Mar 10 21:42:19 2009 -0700 37.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 37.3 @@ -1,289 +0,0 @@ 37.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 37.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 37.6 -<svg 37.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 37.8 - xmlns:cc="http://web.resource.org/cc/" 37.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 37.10 - xmlns:svg="http://www.w3.org/2000/svg" 37.11 - xmlns="http://www.w3.org/2000/svg" 37.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 37.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 37.14 - width="744.09448819" 37.15 - height="1052.3622047" 37.16 - id="svg2" 37.17 - sodipodi:version="0.32" 37.18 - inkscape:version="0.44.1" 37.19 - sodipodi:docname="tour-history.svg"> 37.20 - <defs 37.21 - id="defs4"> 37.22 - <marker 37.23 - inkscape:stockid="Arrow1Mstart" 37.24 - orient="auto" 37.25 - refY="0.0" 37.26 - refX="0.0" 37.27 - id="Arrow1Mstart" 37.28 - style="overflow:visible"> 37.29 - <path 37.30 - id="path2973" 37.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 " 37.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 37.33 - transform="scale(0.4) translate(10,0)" /> 37.34 - </marker> 37.35 - <marker 37.36 - inkscape:stockid="Arrow1Mend" 37.37 - orient="auto" 37.38 - refY="0.0" 37.39 - refX="0.0" 37.40 - id="Arrow1Mend" 37.41 - style="overflow:visible;"> 37.42 - <path 37.43 - id="path3066" 37.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 " 37.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 37.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 37.47 - </marker> 37.48 - </defs> 37.49 - <sodipodi:namedview 37.50 - id="base" 37.51 - pagecolor="#ffffff" 37.52 - bordercolor="#666666" 37.53 - borderopacity="1.0" 37.54 - gridtolerance="10000" 37.55 - guidetolerance="10" 37.56 - objecttolerance="10" 37.57 - inkscape:pageopacity="0.0" 37.58 - inkscape:pageshadow="2" 37.59 - inkscape:zoom="1.4" 37.60 - inkscape:cx="232.14286" 37.61 - inkscape:cy="672.75296" 37.62 - inkscape:document-units="px" 37.63 - inkscape:current-layer="layer1" 37.64 - inkscape:window-width="906" 37.65 - inkscape:window-height="620" 37.66 - inkscape:window-x="5" 37.67 - inkscape:window-y="49" /> 37.68 - <metadata 37.69 - id="metadata7"> 37.70 - <rdf:RDF> 37.71 - <cc:Work 37.72 - rdf:about=""> 37.73 - <dc:format>image/svg+xml</dc:format> 37.74 - <dc:type 37.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 37.76 - </cc:Work> 37.77 - </rdf:RDF> 37.78 - </metadata> 37.79 - <g 37.80 - inkscape:label="Layer 1" 37.81 - inkscape:groupmode="layer" 37.82 - id="layer1"> 37.83 - <rect 37.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" 37.85 - id="rect1878" 37.86 - width="94.285713" 37.87 - height="20.714285" 37.88 - x="138" 37.89 - y="479.50504" /> 37.90 - <text 37.91 - xml:space="preserve" 37.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" 37.93 - x="162.09892" 37.94 - y="493.12619" 37.95 - id="text1872"><tspan 37.96 - sodipodi:role="line" 37.97 - id="tspan1874" 37.98 - x="162.09892" 37.99 - y="493.12619" 37.100 - style="font-family:Courier"><tspan 37.101 - style="font-weight:bold" 37.102 - id="tspan1876">0</tspan>: REV0</tspan></text> 37.103 - <rect 37.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" 37.105 - id="rect2800" 37.106 - width="94.285713" 37.107 - height="20.714285" 37.108 - x="138" 37.109 - y="432.63004" /> 37.110 - <text 37.111 - xml:space="preserve" 37.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" 37.113 - x="162.09892" 37.114 - y="446.25119" 37.115 - id="text2794"><tspan 37.116 - sodipodi:role="line" 37.117 - id="tspan2796" 37.118 - x="162.09892" 37.119 - y="446.25119" 37.120 - style="font-family:Courier"><tspan 37.121 - id="tspan2868" 37.122 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 37.123 - <rect 37.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" 37.125 - id="rect2810" 37.126 - width="94.285713" 37.127 - height="20.714285" 37.128 - x="138" 37.129 - y="385.75504" /> 37.130 - <text 37.131 - xml:space="preserve" 37.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" 37.133 - x="162.09892" 37.134 - y="399.37619" 37.135 - id="text2804"><tspan 37.136 - sodipodi:role="line" 37.137 - id="tspan2806" 37.138 - x="162.09892" 37.139 - y="399.37619" 37.140 - style="font-family:Courier"><tspan 37.141 - style="font-weight:bold" 37.142 - id="tspan2866">2</tspan>: REV2</tspan></text> 37.143 - <rect 37.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" 37.145 - id="rect2820" 37.146 - width="94.285713" 37.147 - height="20.714285" 37.148 - x="138" 37.149 - y="338.88007" /> 37.150 - <text 37.151 - xml:space="preserve" 37.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" 37.153 - x="162.09892" 37.154 - y="352.50122" 37.155 - id="text2814"><tspan 37.156 - sodipodi:role="line" 37.157 - id="tspan2816" 37.158 - x="162.09892" 37.159 - y="352.50122" 37.160 - style="font-family:Courier"><tspan 37.161 - style="font-weight:bold" 37.162 - id="tspan2864">3</tspan>: REV3</tspan></text> 37.163 - <rect 37.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" 37.165 - id="rect2830" 37.166 - width="94.285713" 37.167 - height="20.714285" 37.168 - x="138" 37.169 - y="292.00504" /> 37.170 - <text 37.171 - xml:space="preserve" 37.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" 37.173 - x="162.09892" 37.174 - y="305.62619" 37.175 - id="text2824"><tspan 37.176 - sodipodi:role="line" 37.177 - id="tspan2826" 37.178 - x="162.09892" 37.179 - y="305.62619" 37.180 - style="font-family:Courier"><tspan 37.181 - style="font-weight:bold" 37.182 - id="tspan2862">4</tspan>: REV4</tspan></text> 37.183 - <text 37.184 - xml:space="preserve" 37.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" 37.186 - x="173.57143" 37.187 - y="443.79074" 37.188 - id="text2832"><tspan 37.189 - sodipodi:role="line" 37.190 - id="tspan2834" 37.191 - x="173.57143" 37.192 - y="443.79074" /></text> 37.193 - <path 37.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)" 37.195 - d="M 185.14286,478.50504 L 185.14286,454.34432" 37.196 - id="path2894" 37.197 - inkscape:connector-type="polyline" /> 37.198 - <path 37.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)" 37.200 - d="M 185.14286,431.63004 L 185.14286,407.46932" 37.201 - id="path2896" 37.202 - inkscape:connector-type="polyline" /> 37.203 - <path 37.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)" 37.205 - d="M 185.14286,384.75504 L 185.14286,360.59435" 37.206 - id="path2898" 37.207 - inkscape:connector-type="polyline" /> 37.208 - <path 37.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)" 37.210 - d="M 185.14286,337.88007 L 185.14286,313.71932" 37.211 - id="path2900" 37.212 - inkscape:connector-type="polyline" /> 37.213 - <text 37.214 - xml:space="preserve" 37.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" 37.216 - x="244.60992" 37.217 - y="305.245" 37.218 - id="text1902"><tspan 37.219 - sodipodi:role="line" 37.220 - id="tspan1904" 37.221 - x="244.60992" 37.222 - y="305.245">(newest)</tspan></text> 37.223 - <text 37.224 - xml:space="preserve" 37.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" 37.226 - x="244.60992" 37.227 - y="492.745" 37.228 - id="text1906"><tspan 37.229 - sodipodi:role="line" 37.230 - id="tspan1908" 37.231 - x="244.60992" 37.232 - y="492.745">(oldest)</tspan></text> 37.233 - <rect 37.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" 37.235 - id="rect1907" 37.236 - width="94.285713" 37.237 - height="20.714285" 37.238 - x="309.28571" 37.239 - y="324.86218" /> 37.240 - <text 37.241 - xml:space="preserve" 37.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" 37.243 - x="333.38464" 37.244 - y="338.48334" 37.245 - id="text1909"><tspan 37.246 - sodipodi:role="line" 37.247 - id="tspan1911" 37.248 - x="333.38464" 37.249 - y="338.48334" 37.250 - style="font-family:Courier"><tspan 37.251 - style="font-weight:bold" 37.252 - id="tspan1913">4</tspan>: REV4</tspan></text> 37.253 - <path 37.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" 37.255 - d="M 332.14286,375.21932 L 335.71429,347.36218" 37.256 - id="path2802" /> 37.257 - <path 37.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" 37.259 - d="M 372.69968,375.21932 L 369.12825,347.36218" 37.260 - id="path2986" /> 37.261 - <text 37.262 - xml:space="preserve" 37.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" 37.264 - x="335.14285" 37.265 - y="387.21933" 37.266 - id="text2988"><tspan 37.267 - sodipodi:role="line" 37.268 - x="335.14285" 37.269 - y="387.21933" 37.270 - id="tspan3020" 37.271 - style="text-align:end;text-anchor:end">revision</tspan><tspan 37.272 - sodipodi:role="line" 37.273 - x="335.14285" 37.274 - y="402.21933" 37.275 - id="tspan3014" 37.276 - style="text-align:end;text-anchor:end">number</tspan></text> 37.277 - <text 37.278 - xml:space="preserve" 37.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" 37.280 - x="368.71429" 37.281 - y="387.21933" 37.282 - id="text2994"><tspan 37.283 - sodipodi:role="line" 37.284 - id="tspan2996" 37.285 - x="368.71429" 37.286 - y="387.21933">changeset</tspan><tspan 37.287 - sodipodi:role="line" 37.288 - x="368.71429" 37.289 - y="402.21933" 37.290 - id="tspan2998">identifier</tspan></text> 37.291 - </g> 37.292 -</svg>
38.1 --- a/en/tour-merge-conflict.svg Tue Mar 10 21:42:19 2009 -0700 38.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 38.3 @@ -1,210 +0,0 @@ 38.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 38.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 38.6 -<svg 38.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 38.8 - xmlns:cc="http://web.resource.org/cc/" 38.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 38.10 - xmlns:svg="http://www.w3.org/2000/svg" 38.11 - xmlns="http://www.w3.org/2000/svg" 38.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 38.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 38.14 - width="744.09448819" 38.15 - height="1052.3622047" 38.16 - id="svg2" 38.17 - sodipodi:version="0.32" 38.18 - inkscape:version="0.44.1" 38.19 - sodipodi:docname="tour-merge-conflict.svg"> 38.20 - <defs 38.21 - id="defs4"> 38.22 - <marker 38.23 - inkscape:stockid="Arrow1Mend" 38.24 - orient="auto" 38.25 - refY="0.0" 38.26 - refX="0.0" 38.27 - id="Arrow1Mend" 38.28 - style="overflow:visible;"> 38.29 - <path 38.30 - id="path3053" 38.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 " 38.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 38.33 - transform="scale(0.4) rotate(180) translate(10,0)" /> 38.34 - </marker> 38.35 - </defs> 38.36 - <sodipodi:namedview 38.37 - id="base" 38.38 - pagecolor="#ffffff" 38.39 - bordercolor="#666666" 38.40 - borderopacity="1.0" 38.41 - gridtolerance="10000" 38.42 - guidetolerance="10" 38.43 - objecttolerance="10" 38.44 - inkscape:pageopacity="0.0" 38.45 - inkscape:pageshadow="2" 38.46 - inkscape:zoom="1.4" 38.47 - inkscape:cx="164.78349" 38.48 - inkscape:cy="590.07679" 38.49 - inkscape:document-units="px" 38.50 - inkscape:current-layer="layer1" 38.51 - inkscape:window-width="906" 38.52 - inkscape:window-height="620" 38.53 - inkscape:window-x="5" 38.54 - inkscape:window-y="49" /> 38.55 - <metadata 38.56 - id="metadata7"> 38.57 - <rdf:RDF> 38.58 - <cc:Work 38.59 - rdf:about=""> 38.60 - <dc:format>image/svg+xml</dc:format> 38.61 - <dc:type 38.62 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 38.63 - </cc:Work> 38.64 - </rdf:RDF> 38.65 - </metadata> 38.66 - <g 38.67 - inkscape:label="Layer 1" 38.68 - inkscape:groupmode="layer" 38.69 - id="layer1"> 38.70 - <g 38.71 - id="g1988" 38.72 - transform="translate(84.85711,0)"> 38.73 - <g 38.74 - id="g1876"> 38.75 - <path 38.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" 38.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 " 38.78 - id="path1872" 38.79 - sodipodi:nodetypes="cccccc" /> 38.80 - <path 38.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" 38.82 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 38.83 - id="path1874" 38.84 - sodipodi:nodetypes="cccc" /> 38.85 - </g> 38.86 - <flowRoot 38.87 - style="font-size:8px;font-family:Times New Roman" 38.88 - id="flowRoot1898" 38.89 - xml:space="preserve"><flowRegion 38.90 - id="flowRegion1900"><rect 38.91 - style="font-size:8px;font-family:Times New Roman" 38.92 - y="464.50504" 38.93 - x="122.85714" 38.94 - height="93.571426" 38.95 - width="76.428574" 38.96 - id="rect1902" /></flowRegion><flowPara 38.97 - id="flowPara1904">Greetings!</flowPara><flowPara 38.98 - id="flowPara1906" /><flowPara 38.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> 38.100 - <g 38.101 - id="g1966" 38.102 - transform="translate(82,0.35715)"> 38.103 - <g 38.104 - transform="translate(-77.85718,-140.0714)" 38.105 - id="g1910"> 38.106 - <path 38.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" 38.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 " 38.109 - id="path1912" 38.110 - sodipodi:nodetypes="cccccc" /> 38.111 - <path 38.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" 38.113 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 38.114 - id="path1914" 38.115 - sodipodi:nodetypes="cccc" /> 38.116 - </g> 38.117 - <flowRoot 38.118 - transform="translate(-77.85718,-140.0714)" 38.119 - style="font-size:8px;font-family:Times New Roman" 38.120 - id="flowRoot1916" 38.121 - xml:space="preserve"><flowRegion 38.122 - id="flowRegion1918"><rect 38.123 - style="font-size:8px;font-family:Times New Roman" 38.124 - y="464.50504" 38.125 - x="122.85714" 38.126 - height="93.571426" 38.127 - width="76.428574" 38.128 - id="rect1920" /></flowRegion><flowPara 38.129 - id="flowPara1922">Greetings!</flowPara><flowPara 38.130 - id="flowPara1924" /><flowPara 38.131 - id="flowPara1926">I am <flowSpan 38.132 - style="font-style:italic;fill:red" 38.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> 38.134 - <g 38.135 - id="g1977" 38.136 - transform="translate(81.99999,-0.35715)"> 38.137 - <g 38.138 - transform="translate(83.57141,-139.3571)" 38.139 - id="g1932"> 38.140 - <path 38.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" 38.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 " 38.143 - id="path1934" 38.144 - sodipodi:nodetypes="cccccc" /> 38.145 - <path 38.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" 38.147 - d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 38.148 - id="path1936" 38.149 - sodipodi:nodetypes="cccc" /> 38.150 - </g> 38.151 - <flowRoot 38.152 - transform="translate(83.57141,-139.3571)" 38.153 - style="font-size:8px;font-family:Times New Roman" 38.154 - id="flowRoot1938" 38.155 - xml:space="preserve"><flowRegion 38.156 - id="flowRegion1940"><rect 38.157 - style="font-size:8px;font-family:Times New Roman" 38.158 - y="464.50504" 38.159 - x="122.85714" 38.160 - height="93.571426" 38.161 - width="76.428574" 38.162 - id="rect1942" /></flowRegion><flowPara 38.163 - id="flowPara1944">Greetings!</flowPara><flowPara 38.164 - id="flowPara1946" /><flowPara 38.165 - id="flowPara1948">I am <flowSpan 38.166 - style="font-style:italic;fill:red" 38.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> 38.168 - <path 38.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" 38.170 - d="M 215.502,457.71933 L 196.35507,424.5765" 38.171 - id="path1999" 38.172 - inkscape:connector-type="polyline" 38.173 - inkscape:connection-start="#g1988" 38.174 - inkscape:connection-end="#g1966" /> 38.175 - <path 38.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" 38.177 - d="M 277.06936,457.71933 L 296.21629,424.5765" 38.178 - id="path2001" 38.179 - inkscape:connector-type="polyline" 38.180 - inkscape:connection-start="#g1988" 38.181 - inkscape:connection-end="#g1977" /> 38.182 - <text 38.183 - xml:space="preserve" 38.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" 38.185 - x="302.42859" 38.186 - y="515.08905" 38.187 - id="text1905"><tspan 38.188 - sodipodi:role="line" 38.189 - id="tspan1907" 38.190 - x="302.42859" 38.191 - y="515.08905">Base version</tspan></text> 38.192 - <text 38.193 - xml:space="preserve" 38.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" 38.195 - x="45.57143" 38.196 - y="374.1619" 38.197 - id="text1917"><tspan 38.198 - sodipodi:role="line" 38.199 - id="tspan1919" 38.200 - x="45.57143" 38.201 - y="374.1619">Our changes</tspan></text> 38.202 - <text 38.203 - xml:space="preserve" 38.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" 38.205 - x="385.71429" 38.206 - y="374.1619" 38.207 - id="text1921"><tspan 38.208 - sodipodi:role="line" 38.209 - id="tspan1923" 38.210 - x="385.71429" 38.211 - y="374.1619">Their changes</tspan></text> 38.212 - </g> 38.213 -</svg>
39.1 --- a/en/tour-merge-merge.svg Tue Mar 10 21:42:19 2009 -0700 39.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 39.3 @@ -1,380 +0,0 @@ 39.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 39.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 39.6 -<svg 39.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 39.8 - xmlns:cc="http://web.resource.org/cc/" 39.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 39.10 - xmlns:svg="http://www.w3.org/2000/svg" 39.11 - xmlns="http://www.w3.org/2000/svg" 39.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 39.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 39.14 - width="744.09448819" 39.15 - height="1052.3622047" 39.16 - id="svg2" 39.17 - sodipodi:version="0.32" 39.18 - inkscape:version="0.44.1" 39.19 - sodipodi:docname="tour-merge-merge.svg"> 39.20 - <defs 39.21 - id="defs4"> 39.22 - <marker 39.23 - inkscape:stockid="Arrow1Mstart" 39.24 - orient="auto" 39.25 - refY="0.0" 39.26 - refX="0.0" 39.27 - id="Arrow1Mstart" 39.28 - style="overflow:visible"> 39.29 - <path 39.30 - id="path2973" 39.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 " 39.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 39.33 - transform="scale(0.4) translate(10,0)" /> 39.34 - </marker> 39.35 - <marker 39.36 - inkscape:stockid="Arrow1Mend" 39.37 - orient="auto" 39.38 - refY="0.0" 39.39 - refX="0.0" 39.40 - id="Arrow1Mend" 39.41 - style="overflow:visible;"> 39.42 - <path 39.43 - id="path3066" 39.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 " 39.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 39.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 39.47 - </marker> 39.48 - </defs> 39.49 - <sodipodi:namedview 39.50 - id="base" 39.51 - pagecolor="#ffffff" 39.52 - bordercolor="#666666" 39.53 - borderopacity="1.0" 39.54 - gridtolerance="10000" 39.55 - guidetolerance="10" 39.56 - objecttolerance="10" 39.57 - inkscape:pageopacity="0.0" 39.58 - inkscape:pageshadow="2" 39.59 - inkscape:zoom="1.4" 39.60 - inkscape:cx="247.53795" 39.61 - inkscape:cy="871.05738" 39.62 - inkscape:document-units="px" 39.63 - inkscape:current-layer="layer1" 39.64 - inkscape:window-width="906" 39.65 - inkscape:window-height="620" 39.66 - inkscape:window-x="38" 39.67 - inkscape:window-y="95" /> 39.68 - <metadata 39.69 - id="metadata7"> 39.70 - <rdf:RDF> 39.71 - <cc:Work 39.72 - rdf:about=""> 39.73 - <dc:format>image/svg+xml</dc:format> 39.74 - <dc:type 39.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 39.76 - </cc:Work> 39.77 - </rdf:RDF> 39.78 - </metadata> 39.79 - <g 39.80 - inkscape:label="Layer 1" 39.81 - inkscape:groupmode="layer" 39.82 - id="layer1"> 39.83 - <rect 39.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" 39.85 - id="rect2995" 39.86 - width="94.285713" 39.87 - height="20.714285" 39.88 - x="532.85718" 39.89 - y="203.0479" /> 39.90 - <text 39.91 - xml:space="preserve" 39.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" 39.93 - x="173.57143" 39.94 - y="443.79074" 39.95 - id="text2832"><tspan 39.96 - sodipodi:role="line" 39.97 - id="tspan2834" 39.98 - x="173.57143" 39.99 - y="443.79074" /></text> 39.100 - <rect 39.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" 39.102 - id="rect2830" 39.103 - width="94.285713" 39.104 - height="20.714285" 39.105 - x="138" 39.106 - y="297.76227" /> 39.107 - <text 39.108 - xml:space="preserve" 39.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" 39.110 - x="162.09892" 39.111 - y="311.38342" 39.112 - id="text2824"><tspan 39.113 - sodipodi:role="line" 39.114 - id="tspan2826" 39.115 - x="162.09892" 39.116 - y="311.38342" 39.117 - style="font-family:Courier"><tspan 39.118 - style="font-weight:bold" 39.119 - id="tspan2862">4</tspan>: REV4</tspan></text> 39.120 - <path 39.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" 39.122 - d="M 185.14286,343.63731 L 185.14286,319.47656" 39.123 - id="path2900" 39.124 - inkscape:connector-type="polyline" /> 39.125 - <rect 39.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" 39.127 - id="rect2863" 39.128 - width="94.285713" 39.129 - height="20.714285" 39.130 - x="91.428574" 39.131 - y="250.47656" /> 39.132 - <text 39.133 - xml:space="preserve" 39.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" 39.135 - x="116.09886" 39.136 - y="264.56592" 39.137 - id="text1965" 39.138 - transform="scale(1.000002,0.999998)"><tspan 39.139 - sodipodi:role="line" 39.140 - id="tspan1967" 39.141 - x="116.09886" 39.142 - y="264.56592" 39.143 - style="font-family:Courier"><tspan 39.144 - style="font-weight:bold" 39.145 - id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 39.146 - <path 39.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" 39.148 - d="M 173.95727,296.76228 L 149.75702,272.19085" 39.149 - id="path1971" 39.150 - inkscape:connector-type="polyline" 39.151 - inkscape:connection-end="#rect2863" 39.152 - inkscape:connection-start="#rect2830" /> 39.153 - <rect 39.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" 39.155 - id="rect2911" 39.156 - width="94.285995" 39.157 - height="20.714283" 39.158 - x="186.71414" 39.159 - y="204.40514" /> 39.160 - <text 39.161 - xml:space="preserve" 39.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" 39.163 - x="210.81311" 39.164 - y="218.02673" 39.165 - id="text2913" 39.166 - transform="scale(1.000002,0.999998)"><tspan 39.167 - sodipodi:role="line" 39.168 - id="tspan2915" 39.169 - x="210.81311" 39.170 - y="218.02673" 39.171 - style="font-family:Courier"><tspan 39.172 - id="tspan1966" 39.173 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 39.174 - <path 39.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" 39.176 - d="M 191.06908,296.76228 L 227.93092,226.11942" 39.177 - id="path2919" 39.178 - inkscape:connector-type="polyline" 39.179 - inkscape:connection-start="#rect2830" /> 39.180 - <text 39.181 - xml:space="preserve" 39.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" 39.183 - x="295.28571" 39.184 - y="217.56711" 39.185 - id="text2871"><tspan 39.186 - sodipodi:role="line" 39.187 - id="tspan2873" 39.188 - x="295.28571" 39.189 - y="217.56711">tip (and head)</tspan></text> 39.190 - <text 39.191 - xml:space="preserve" 39.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" 39.193 - x="76" 39.194 - y="264.91769" 39.195 - id="text2875"><tspan 39.196 - sodipodi:role="line" 39.197 - id="tspan2877" 39.198 - x="76" 39.199 - y="264.91769" 39.200 - style="text-align:end;text-anchor:end">head</tspan></text> 39.201 - <rect 39.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" 39.203 - id="rect1913" 39.204 - width="94.285713" 39.205 - height="20.714285" 39.206 - x="138" 39.207 - y="156.90514" /> 39.208 - <path 39.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" 39.210 - d="M 144.22399,249.47657 L 179.49029,178.61943" 39.211 - id="path1915" 39.212 - inkscape:connector-type="polyline" 39.213 - inkscape:connection-start="#rect2863" 39.214 - inkscape:connection-end="#rect1913" /> 39.215 - <path 39.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" 39.217 - d="M 222.20966,203.40514 L 196.79033,178.61943" 39.218 - id="path1917" 39.219 - inkscape:connector-type="polyline" 39.220 - inkscape:connection-start="#rect2911" 39.221 - inkscape:connection-end="#rect1913" /> 39.222 - <text 39.223 - xml:space="preserve" 39.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" 39.225 - x="166.16823" 39.226 - y="168.52228" 39.227 - id="text2806"><tspan 39.228 - sodipodi:role="line" 39.229 - id="tspan2808" 39.230 - x="166.16823" 39.231 - y="168.52228" 39.232 - style="font-family:Courier">merge</tspan></text> 39.233 - <text 39.234 - xml:space="preserve" 39.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" 39.236 - x="246" 39.237 - y="162.63338" 39.238 - id="text2810"><tspan 39.239 - sodipodi:role="line" 39.240 - id="tspan2812" 39.241 - x="246" 39.242 - y="162.63338">working directory</tspan><tspan 39.243 - sodipodi:role="line" 39.244 - x="246" 39.245 - y="177.63338" 39.246 - id="tspan2814">during merge</tspan></text> 39.247 - <rect 39.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" 39.249 - id="rect2816" 39.250 - width="94.285713" 39.251 - height="20.714285" 39.252 - x="483.14636" 39.253 - y="297.76227" /> 39.254 - <text 39.255 - xml:space="preserve" 39.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" 39.257 - x="507.24527" 39.258 - y="311.38342" 39.259 - id="text2818"><tspan 39.260 - sodipodi:role="line" 39.261 - id="tspan2820" 39.262 - x="507.24527" 39.263 - y="311.38342" 39.264 - style="font-family:Courier"><tspan 39.265 - style="font-weight:bold" 39.266 - id="tspan2822">4</tspan>: REV4</tspan></text> 39.267 - <path 39.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" 39.269 - d="M 530.28921,343.6373 L 530.28921,319.47655" 39.270 - id="path2824" 39.271 - inkscape:connector-type="polyline" /> 39.272 - <rect 39.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" 39.274 - id="rect2826" 39.275 - width="94.285713" 39.276 - height="20.714285" 39.277 - x="436.57492" 39.278 - y="250.47656" /> 39.279 - <text 39.280 - xml:space="preserve" 39.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" 39.282 - x="461.24484" 39.283 - y="264.56613" 39.284 - id="text2828" 39.285 - transform="scale(1.000002,0.999998)"><tspan 39.286 - sodipodi:role="line" 39.287 - id="tspan2830" 39.288 - x="461.24484" 39.289 - y="264.56613" 39.290 - style="font-family:Courier"><tspan 39.291 - style="font-weight:bold" 39.292 - id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 39.293 - <path 39.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" 39.295 - d="M 519.10362,296.76227 L 494.90337,272.19084" 39.296 - id="path2834" 39.297 - inkscape:connector-type="polyline" /> 39.298 - <rect 39.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" 39.300 - id="rect2836" 39.301 - width="94.285995" 39.302 - height="20.714283" 39.303 - x="483.14001" 39.304 - y="156.548" /> 39.305 - <text 39.306 - xml:space="preserve" 39.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" 39.308 - x="555.95911" 39.309 - y="218.02698" 39.310 - id="text2838" 39.311 - transform="scale(1.000002,0.999998)"><tspan 39.312 - sodipodi:role="line" 39.313 - id="tspan2840" 39.314 - x="555.95911" 39.315 - y="218.02698" 39.316 - style="font-family:Courier"><tspan 39.317 - id="tspan2842" 39.318 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 39.319 - <path 39.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" 39.321 - d="M 536.21543,296.76227 L 574.03453,224.76218" 39.322 - id="path2844" 39.323 - inkscape:connector-type="polyline" /> 39.324 - <text 39.325 - xml:space="preserve" 39.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" 39.327 - x="594.43207" 39.328 - y="169.78796" 39.329 - id="text2846"><tspan 39.330 - sodipodi:role="line" 39.331 - id="tspan2848" 39.332 - x="594.43207" 39.333 - y="169.78796">tip</tspan></text> 39.334 - <path 39.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" 39.336 - d="M 489.37034,249.47656 L 524.65575,178.26229" 39.337 - id="path2856" 39.338 - inkscape:connector-type="polyline" 39.339 - inkscape:connection-end="#rect2836" /> 39.340 - <path 39.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" 39.342 - d="M 567.85714,202.0479 L 542.42591,178.26229" 39.343 - id="path2858" 39.344 - inkscape:connector-type="polyline" 39.345 - inkscape:connection-end="#rect2836" 39.346 - inkscape:connection-start="#rect2995" /> 39.347 - <text 39.348 - xml:space="preserve" 39.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" 39.350 - x="504.54507" 39.351 - y="170.39714" 39.352 - id="text2860"><tspan 39.353 - sodipodi:role="line" 39.354 - id="tspan2863" 39.355 - x="504.54507" 39.356 - y="170.39714" 39.357 - style="font-family:Courier"><tspan 39.358 - style="font-weight:bold" 39.359 - id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 39.360 - <text 39.361 - xml:space="preserve" 39.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" 39.363 - x="90.323105" 39.364 - y="120.21933" 39.365 - id="text2929"><tspan 39.366 - sodipodi:role="line" 39.367 - id="tspan2931" 39.368 - x="90.323105" 39.369 - y="120.21933" 39.370 - style="font-weight:bold">Working directory during merge</tspan></text> 39.371 - <text 39.372 - xml:space="preserve" 39.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" 39.374 - x="435.35226" 39.375 - y="120.21933" 39.376 - id="text2937"><tspan 39.377 - sodipodi:role="line" 39.378 - id="tspan2939" 39.379 - x="435.35226" 39.380 - y="120.21933" 39.381 - style="font-weight:bold">Repository after merge committed</tspan></text> 39.382 - </g> 39.383 -</svg>
40.1 --- a/en/tour-merge-pull.svg Tue Mar 10 21:42:19 2009 -0700 40.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 40.3 @@ -1,288 +0,0 @@ 40.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 40.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 40.6 -<svg 40.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 40.8 - xmlns:cc="http://web.resource.org/cc/" 40.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 40.10 - xmlns:svg="http://www.w3.org/2000/svg" 40.11 - xmlns="http://www.w3.org/2000/svg" 40.12 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 40.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 40.14 - width="744.09448819" 40.15 - height="1052.3622047" 40.16 - id="svg2" 40.17 - sodipodi:version="0.32" 40.18 - inkscape:version="0.44.1" 40.19 - sodipodi:docname="tour-merge-pull.svg" 40.20 - sodipodi:docbase="/home/bos/hg/hgbook/en"> 40.21 - <defs 40.22 - id="defs4"> 40.23 - <marker 40.24 - inkscape:stockid="Arrow1Mstart" 40.25 - orient="auto" 40.26 - refY="0.0" 40.27 - refX="0.0" 40.28 - id="Arrow1Mstart" 40.29 - style="overflow:visible"> 40.30 - <path 40.31 - id="path2973" 40.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 " 40.33 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 40.34 - transform="scale(0.4) translate(10,0)" /> 40.35 - </marker> 40.36 - <marker 40.37 - inkscape:stockid="Arrow1Mend" 40.38 - orient="auto" 40.39 - refY="0.0" 40.40 - refX="0.0" 40.41 - id="Arrow1Mend" 40.42 - style="overflow:visible;"> 40.43 - <path 40.44 - id="path3066" 40.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 " 40.46 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 40.47 - transform="scale(0.4) rotate(180) translate(10,0)" /> 40.48 - </marker> 40.49 - </defs> 40.50 - <sodipodi:namedview 40.51 - id="base" 40.52 - pagecolor="#ffffff" 40.53 - bordercolor="#666666" 40.54 - borderopacity="1.0" 40.55 - gridtolerance="10000" 40.56 - guidetolerance="10" 40.57 - objecttolerance="10" 40.58 - inkscape:pageopacity="0.0" 40.59 - inkscape:pageshadow="2" 40.60 - inkscape:zoom="1.4" 40.61 - inkscape:cx="233.63208" 40.62 - inkscape:cy="832.54381" 40.63 - inkscape:document-units="px" 40.64 - inkscape:current-layer="layer1" 40.65 - inkscape:window-width="906" 40.66 - inkscape:window-height="620" 40.67 - inkscape:window-x="237" 40.68 - inkscape:window-y="103" /> 40.69 - <metadata 40.70 - id="metadata7"> 40.71 - <rdf:RDF> 40.72 - <cc:Work 40.73 - rdf:about=""> 40.74 - <dc:format>image/svg+xml</dc:format> 40.75 - <dc:type 40.76 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 40.77 - </cc:Work> 40.78 - </rdf:RDF> 40.79 - </metadata> 40.80 - <g 40.81 - inkscape:label="Layer 1" 40.82 - inkscape:groupmode="layer" 40.83 - id="layer1"> 40.84 - <text 40.85 - xml:space="preserve" 40.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" 40.87 - x="173.57143" 40.88 - y="443.79074" 40.89 - id="text2832"><tspan 40.90 - sodipodi:role="line" 40.91 - id="tspan2834" 40.92 - x="173.57143" 40.93 - y="443.79074" /></text> 40.94 - <rect 40.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" 40.96 - id="rect1878" 40.97 - width="94.285713" 40.98 - height="20.714285" 40.99 - x="138" 40.100 - y="479.50504" /> 40.101 - <text 40.102 - xml:space="preserve" 40.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" 40.104 - x="162.09892" 40.105 - y="493.12619" 40.106 - id="text1872"><tspan 40.107 - sodipodi:role="line" 40.108 - id="tspan1874" 40.109 - x="162.09892" 40.110 - y="493.12619" 40.111 - style="font-family:Courier"><tspan 40.112 - style="font-weight:bold" 40.113 - id="tspan1876">0</tspan>: REV0</tspan></text> 40.114 - <rect 40.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" 40.116 - id="rect2800" 40.117 - width="94.285713" 40.118 - height="20.714285" 40.119 - x="138" 40.120 - y="432.63004" /> 40.121 - <text 40.122 - xml:space="preserve" 40.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" 40.124 - x="162.09892" 40.125 - y="446.25119" 40.126 - id="text2794"><tspan 40.127 - sodipodi:role="line" 40.128 - id="tspan2796" 40.129 - x="162.09892" 40.130 - y="446.25119" 40.131 - style="font-family:Courier"><tspan 40.132 - id="tspan2868" 40.133 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 40.134 - <rect 40.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" 40.136 - id="rect2810" 40.137 - width="94.285713" 40.138 - height="20.714285" 40.139 - x="138" 40.140 - y="385.75504" /> 40.141 - <text 40.142 - xml:space="preserve" 40.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" 40.144 - x="162.09892" 40.145 - y="399.37619" 40.146 - id="text2804"><tspan 40.147 - sodipodi:role="line" 40.148 - id="tspan2806" 40.149 - x="162.09892" 40.150 - y="399.37619" 40.151 - style="font-family:Courier"><tspan 40.152 - style="font-weight:bold" 40.153 - id="tspan2866">2</tspan>: REV2</tspan></text> 40.154 - <rect 40.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" 40.156 - id="rect2820" 40.157 - width="94.285713" 40.158 - height="20.714285" 40.159 - x="138" 40.160 - y="338.88007" /> 40.161 - <text 40.162 - xml:space="preserve" 40.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" 40.164 - x="162.09892" 40.165 - y="352.50122" 40.166 - id="text2814"><tspan 40.167 - sodipodi:role="line" 40.168 - id="tspan2816" 40.169 - x="162.09892" 40.170 - y="352.50122" 40.171 - style="font-family:Courier"><tspan 40.172 - style="font-weight:bold" 40.173 - id="tspan2864">3</tspan>: REV3</tspan></text> 40.174 - <rect 40.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" 40.176 - id="rect2830" 40.177 - width="94.285713" 40.178 - height="20.714285" 40.179 - x="138" 40.180 - y="292.00504" /> 40.181 - <text 40.182 - xml:space="preserve" 40.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" 40.184 - x="162.09892" 40.185 - y="305.62619" 40.186 - id="text2824"><tspan 40.187 - sodipodi:role="line" 40.188 - id="tspan2826" 40.189 - x="162.09892" 40.190 - y="305.62619" 40.191 - style="font-family:Courier"><tspan 40.192 - style="font-weight:bold" 40.193 - id="tspan2862">4</tspan>: REV4</tspan></text> 40.194 - <path 40.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" 40.196 - d="M 185.14286,478.50504 L 185.14286,454.34432" 40.197 - id="path2894" 40.198 - inkscape:connector-type="polyline" /> 40.199 - <path 40.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" 40.201 - d="M 185.14286,431.63004 L 185.14286,407.46932" 40.202 - id="path2896" 40.203 - inkscape:connector-type="polyline" /> 40.204 - <path 40.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" 40.206 - d="M 185.14286,384.75504 L 185.14286,360.59435" 40.207 - id="path2898" 40.208 - inkscape:connector-type="polyline" /> 40.209 - <path 40.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" 40.211 - d="M 185.14286,337.88007 L 185.14286,313.71932" 40.212 - id="path2900" 40.213 - inkscape:connector-type="polyline" /> 40.214 - <rect 40.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" 40.216 - id="rect2863" 40.217 - width="94.285713" 40.218 - height="20.714285" 40.219 - x="91.428574" 40.220 - y="244.71933" /> 40.221 - <text 40.222 - xml:space="preserve" 40.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" 40.224 - x="116.09886" 40.225 - y="258.80865" 40.226 - id="text1965" 40.227 - transform="scale(1.000002,0.999998)"><tspan 40.228 - sodipodi:role="line" 40.229 - id="tspan1967" 40.230 - x="116.09886" 40.231 - y="258.80865" 40.232 - style="font-family:Courier"><tspan 40.233 - style="font-weight:bold" 40.234 - id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 40.235 - <path 40.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" 40.237 - d="M 173.95727,291.00504 L 149.75702,266.43361" 40.238 - id="path1971" 40.239 - inkscape:connector-type="polyline" 40.240 - inkscape:connection-end="#rect2863" 40.241 - inkscape:connection-start="#rect2830" /> 40.242 - <rect 40.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" 40.244 - id="rect2911" 40.245 - width="94.285995" 40.246 - height="20.714283" 40.247 - x="186.71414" 40.248 - y="198.6479" /> 40.249 - <text 40.250 - xml:space="preserve" 40.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" 40.252 - x="210.81311" 40.253 - y="212.26949" 40.254 - id="text2913" 40.255 - transform="scale(1.000002,0.999998)"><tspan 40.256 - sodipodi:role="line" 40.257 - id="tspan2915" 40.258 - x="210.81311" 40.259 - y="212.26949" 40.260 - style="font-family:Courier"><tspan 40.261 - id="tspan1966" 40.262 - style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 40.263 - <path 40.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" 40.265 - d="M 191.06908,291.00504 L 227.93092,220.36218" 40.266 - id="path2919" 40.267 - inkscape:connector-type="polyline" 40.268 - inkscape:connection-start="#rect2830" /> 40.269 - <text 40.270 - xml:space="preserve" 40.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" 40.272 - x="295.28571" 40.273 - y="211.80988" 40.274 - id="text2871"><tspan 40.275 - sodipodi:role="line" 40.276 - id="tspan2873" 40.277 - x="295.28571" 40.278 - y="211.80988">tip (and head)</tspan></text> 40.279 - <text 40.280 - xml:space="preserve" 40.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" 40.282 - x="76" 40.283 - y="259.16046" 40.284 - id="text2875"><tspan 40.285 - sodipodi:role="line" 40.286 - id="tspan2877" 40.287 - x="76" 40.288 - y="259.16046" 40.289 - style="text-align:end;text-anchor:end">head</tspan></text> 40.290 - </g> 40.291 -</svg>
41.1 --- a/en/tour-merge-sep-repos.svg Tue Mar 10 21:42:19 2009 -0700 41.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 41.3 @@ -1,466 +0,0 @@ 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 41.13 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 41.14 - width="744.09448819" 41.15 - height="1052.3622047" 41.16 - id="svg2" 41.17 - sodipodi:version="0.32" 41.18 - inkscape:version="0.44.1" 41.19 - sodipodi:docname="tour-merge-sep-repos.svg"> 41.20 - <defs 41.21 - id="defs4"> 41.22 - <marker 41.23 - inkscape:stockid="Arrow1Mstart" 41.24 - orient="auto" 41.25 - refY="0.0" 41.26 - refX="0.0" 41.27 - id="Arrow1Mstart" 41.28 - style="overflow:visible"> 41.29 - <path 41.30 - id="path2973" 41.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 " 41.32 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 41.33 - transform="scale(0.4) translate(10,0)" /> 41.34 - </marker> 41.35 - <marker 41.36 - inkscape:stockid="Arrow1Mend" 41.37 - orient="auto" 41.38 - refY="0.0" 41.39 - refX="0.0" 41.40 - id="Arrow1Mend" 41.41 - style="overflow:visible;"> 41.42 - <path 41.43 - id="path3066" 41.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 " 41.45 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 41.46 - transform="scale(0.4) rotate(180) translate(10,0)" /> 41.47 - </marker> 41.48 - </defs> 41.49 - <sodipodi:namedview 41.50 - id="base" 41.51 - pagecolor="#ffffff" 41.52 - bordercolor="#666666" 41.53 - borderopacity="1.0" 41.54 - gridtolerance="10000" 41.55 - guidetolerance="10" 41.56 - objecttolerance="10" 41.57 - inkscape:pageopacity="0.0" 41.58 - inkscape:pageshadow="2" 41.59 - inkscape:zoom="1.4" 41.60 - inkscape:cx="307.20351" 41.61 - inkscape:cy="716.87911" 41.62 - inkscape:document-units="px" 41.63 - inkscape:current-layer="layer1" 41.64 - inkscape:window-width="906" 41.65 - inkscape:window-height="620" 41.66 - inkscape:window-x="5" 41.67 - inkscape:window-y="49" /> 41.68 - <metadata 41.69 - id="metadata7"> 41.70 - <rdf:RDF> 41.71 - <cc:Work 41.72 - rdf:about=""> 41.73 - <dc:format>image/svg+xml</dc:format> 41.74 - <dc:type 41.75 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 41.76 - </cc:Work> 41.77 - </rdf:RDF> 41.78 - </metadata> 41.79 - <g 41.80 - inkscape:label="Layer 1" 41.81 - inkscape:groupmode="layer" 41.82 - id="layer1"> 41.83 - <text 41.84 - xml:space="preserve" 41.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" 41.86 - x="173.57143" 41.87 - y="443.79074" 41.88 - id="text2832"><tspan 41.89 - sodipodi:role="line" 41.90 - id="tspan2834" 41.91 - x="173.57143" 41.92 - y="443.79074" /></text> 41.93 - <rect 41.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" 41.95 - id="rect1878" 41.96 - width="94.285713" 41.97 - height="20.714285" 41.98 - x="138" 41.99 - y="479.50504" /> 41.100 - <text 41.101 - xml:space="preserve" 41.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" 41.103 - x="162.09892" 41.104 - y="493.12619" 41.105 - id="text1872"><tspan 41.106 - sodipodi:role="line" 41.107 - id="tspan1874" 41.108 - x="162.09892" 41.109 - y="493.12619" 41.110 - style="font-family:Courier"><tspan 41.111 - style="font-weight:bold" 41.112 - id="tspan1876">0</tspan>: REV0</tspan></text> 41.113 - <rect 41.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" 41.115 - id="rect2800" 41.116 - width="94.285713" 41.117 - height="20.714285" 41.118 - x="138" 41.119 - y="432.63004" /> 41.120 - <text 41.121 - xml:space="preserve" 41.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" 41.123 - x="162.09892" 41.124 - y="446.25119" 41.125 - id="text2794"><tspan 41.126 - sodipodi:role="line" 41.127 - id="tspan2796" 41.128 - x="162.09892" 41.129 - y="446.25119" 41.130 - style="font-family:Courier"><tspan 41.131 - id="tspan2868" 41.132 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 41.133 - <rect 41.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" 41.135 - id="rect2810" 41.136 - width="94.285713" 41.137 - height="20.714285" 41.138 - x="138" 41.139 - y="385.75504" /> 41.140 - <text 41.141 - xml:space="preserve" 41.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" 41.143 - x="162.09892" 41.144 - y="399.37619" 41.145 - id="text2804"><tspan 41.146 - sodipodi:role="line" 41.147 - id="tspan2806" 41.148 - x="162.09892" 41.149 - y="399.37619" 41.150 - style="font-family:Courier"><tspan 41.151 - style="font-weight:bold" 41.152 - id="tspan2866">2</tspan>: REV2</tspan></text> 41.153 - <rect 41.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" 41.155 - id="rect2820" 41.156 - width="94.285713" 41.157 - height="20.714285" 41.158 - x="138" 41.159 - y="338.88007" /> 41.160 - <text 41.161 - xml:space="preserve" 41.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" 41.163 - x="162.09892" 41.164 - y="352.50122" 41.165 - id="text2814"><tspan 41.166 - sodipodi:role="line" 41.167 - id="tspan2816" 41.168 - x="162.09892" 41.169 - y="352.50122" 41.170 - style="font-family:Courier"><tspan 41.171 - style="font-weight:bold" 41.172 - id="tspan2864">3</tspan>: REV3</tspan></text> 41.173 - <rect 41.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" 41.175 - id="rect2830" 41.176 - width="94.285713" 41.177 - height="20.714285" 41.178 - x="138" 41.179 - y="292.00504" /> 41.180 - <text 41.181 - xml:space="preserve" 41.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" 41.183 - x="162.09892" 41.184 - y="305.62619" 41.185 - id="text2824"><tspan 41.186 - sodipodi:role="line" 41.187 - id="tspan2826" 41.188 - x="162.09892" 41.189 - y="305.62619" 41.190 - style="font-family:Courier"><tspan 41.191 - style="font-weight:bold" 41.192 - id="tspan2862">4</tspan>: REV4</tspan></text> 41.193 - <path 41.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" 41.195 - d="M 185.14286,478.50504 L 185.14286,454.34432" 41.196 - id="path2894" 41.197 - inkscape:connector-type="polyline" /> 41.198 - <path 41.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" 41.200 - d="M 185.14286,431.63004 L 185.14286,407.46932" 41.201 - id="path2896" 41.202 - inkscape:connector-type="polyline" /> 41.203 - <path 41.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" 41.205 - d="M 185.14286,384.75504 L 185.14286,360.59435" 41.206 - id="path2898" 41.207 - inkscape:connector-type="polyline" /> 41.208 - <path 41.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" 41.210 - d="M 185.14286,337.88007 L 185.14286,313.71932" 41.211 - id="path2900" 41.212 - inkscape:connector-type="polyline" /> 41.213 - <rect 41.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" 41.215 - id="rect1963" 41.216 - width="94.285995" 41.217 - height="20.714283" 41.218 - x="138" 41.219 - y="245.18723" /> 41.220 - <text 41.221 - xml:space="preserve" 41.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" 41.223 - x="162.09877" 41.224 - y="258.80865" 41.225 - id="text1965" 41.226 - transform="scale(1.000002,0.999998)"><tspan 41.227 - sodipodi:role="line" 41.228 - id="tspan1967" 41.229 - x="162.09877" 41.230 - y="258.80865" 41.231 - style="font-family:Courier"><tspan 41.232 - style="font-weight:bold" 41.233 - id="tspan1973">5</tspan>: REV_my_hello</tspan></text> 41.234 - <path 41.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" 41.236 - d="M 185.143,291.06218 L 185.143,266.90143" 41.237 - id="path1971" 41.238 - inkscape:connector-type="polyline" /> 41.239 - <text 41.240 - xml:space="preserve" 41.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" 41.242 - x="136.90039" 41.243 - y="232.25546" 41.244 - id="text2921"><tspan 41.245 - sodipodi:role="line" 41.246 - id="tspan2923" 41.247 - x="136.90039" 41.248 - y="232.25546">my-hello</tspan></text> 41.249 - <rect 41.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" 41.251 - id="rect2863" 41.252 - width="94.285713" 41.253 - height="20.714285" 41.254 - x="370.71414" 41.255 - y="479.49289" /> 41.256 - <text 41.257 - xml:space="preserve" 41.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" 41.259 - x="394.81305" 41.260 - y="493.11404" 41.261 - id="text2865"><tspan 41.262 - sodipodi:role="line" 41.263 - id="tspan2867" 41.264 - x="394.81305" 41.265 - y="493.11404" 41.266 - style="font-family:Courier"><tspan 41.267 - style="font-weight:bold" 41.268 - id="tspan2869">0</tspan>: REV0</tspan></text> 41.269 - <rect 41.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" 41.271 - id="rect2871" 41.272 - width="94.285713" 41.273 - height="20.714285" 41.274 - x="370.71414" 41.275 - y="432.61789" /> 41.276 - <text 41.277 - xml:space="preserve" 41.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" 41.279 - x="394.81305" 41.280 - y="446.23904" 41.281 - id="text2873"><tspan 41.282 - sodipodi:role="line" 41.283 - id="tspan2875" 41.284 - x="394.81305" 41.285 - y="446.23904" 41.286 - style="font-family:Courier"><tspan 41.287 - id="tspan2877" 41.288 - style="font-weight:bold">1</tspan>: REV1</tspan></text> 41.289 - <rect 41.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" 41.291 - id="rect2879" 41.292 - width="94.285713" 41.293 - height="20.714285" 41.294 - x="370.71414" 41.295 - y="385.74289" /> 41.296 - <text 41.297 - xml:space="preserve" 41.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" 41.299 - x="394.81305" 41.300 - y="399.36404" 41.301 - id="text2881"><tspan 41.302 - sodipodi:role="line" 41.303 - id="tspan2883" 41.304 - x="394.81305" 41.305 - y="399.36404" 41.306 - style="font-family:Courier"><tspan 41.307 - style="font-weight:bold" 41.308 - id="tspan2885">2</tspan>: REV2</tspan></text> 41.309 - <rect 41.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" 41.311 - id="rect2887" 41.312 - width="94.285713" 41.313 - height="20.714285" 41.314 - x="370.71414" 41.315 - y="338.86792" /> 41.316 - <text 41.317 - xml:space="preserve" 41.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" 41.319 - x="394.81305" 41.320 - y="352.48907" 41.321 - id="text2889"><tspan 41.322 - sodipodi:role="line" 41.323 - id="tspan2891" 41.324 - x="394.81305" 41.325 - y="352.48907" 41.326 - style="font-family:Courier"><tspan 41.327 - style="font-weight:bold" 41.328 - id="tspan2893">3</tspan>: REV3</tspan></text> 41.329 - <rect 41.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" 41.331 - id="rect2895" 41.332 - width="94.285713" 41.333 - height="20.714285" 41.334 - x="370.71414" 41.335 - y="291.99289" /> 41.336 - <text 41.337 - xml:space="preserve" 41.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" 41.339 - x="394.81305" 41.340 - y="305.61404" 41.341 - id="text2897"><tspan 41.342 - sodipodi:role="line" 41.343 - id="tspan2899" 41.344 - x="394.81305" 41.345 - y="305.61404" 41.346 - style="font-family:Courier"><tspan 41.347 - style="font-weight:bold" 41.348 - id="tspan2901">4</tspan>: REV4</tspan></text> 41.349 - <path 41.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" 41.351 - d="M 417.85701,478.4929 L 417.85701,454.33218" 41.352 - id="path2903" 41.353 - inkscape:connector-type="polyline" /> 41.354 - <path 41.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" 41.356 - d="M 417.85701,431.6179 L 417.85701,407.45718" 41.357 - id="path2905" 41.358 - inkscape:connector-type="polyline" /> 41.359 - <path 41.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" 41.361 - d="M 417.85701,384.7429 L 417.85701,360.58221" 41.362 - id="path2907" 41.363 - inkscape:connector-type="polyline" /> 41.364 - <path 41.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" 41.366 - d="M 417.85701,337.86793 L 417.85701,313.70718" 41.367 - id="path2909" 41.368 - inkscape:connector-type="polyline" /> 41.369 - <rect 41.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" 41.371 - id="rect2911" 41.372 - width="94.285995" 41.373 - height="20.714283" 41.374 - x="370.71414" 41.375 - y="245.17511" /> 41.376 - <text 41.377 - xml:space="preserve" 41.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" 41.379 - x="394.81274" 41.380 - y="258.79678" 41.381 - id="text2913" 41.382 - transform="scale(1.000002,0.999998)"><tspan 41.383 - sodipodi:role="line" 41.384 - id="tspan2915" 41.385 - x="394.81274" 41.386 - y="258.79678" 41.387 - style="font-family:Courier"><tspan 41.388 - style="font-weight:bold" 41.389 - id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text> 41.390 - <path 41.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" 41.392 - d="M 417.85715,291.05004 L 417.85715,266.88929" 41.393 - id="path2919" 41.394 - inkscape:connector-type="polyline" /> 41.395 - <text 41.396 - xml:space="preserve" 41.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" 41.398 - x="369.61453" 41.399 - y="232.25546" 41.400 - id="text2925"><tspan 41.401 - sodipodi:role="line" 41.402 - id="tspan2927" 41.403 - x="369.61453" 41.404 - y="232.25546">my-new-hello</tspan></text> 41.405 - <text 41.406 - xml:space="preserve" 41.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" 41.408 - x="300.54352" 41.409 - y="252.12723" 41.410 - id="text2933"><tspan 41.411 - sodipodi:role="line" 41.412 - id="tspan2935" 41.413 - x="300.54352" 41.414 - y="252.12723" 41.415 - style="text-align:center;text-anchor:middle">newest changes</tspan><tspan 41.416 - sodipodi:role="line" 41.417 - x="300.54352" 41.418 - y="267.12723" 41.419 - style="text-align:center;text-anchor:middle" 41.420 - id="tspan3132">differ</tspan></text> 41.421 - <text 41.422 - xml:space="preserve" 41.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" 41.424 - x="262.15436" 41.425 - y="398.37112" 41.426 - id="text2929"><tspan 41.427 - sodipodi:role="line" 41.428 - x="262.15436" 41.429 - y="398.37112" 41.430 - id="tspan3013" 41.431 - style="text-align:start;text-anchor:start">common history</tspan></text> 41.432 - <g 41.433 - id="g3107" 41.434 - transform="translate(0,0.855744)"> 41.435 - <path 41.436 - id="path3101" 41.437 - d="M 300.35713,381.29075 L 300.35713,304.50504" 41.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" /> 41.439 - <path 41.440 - id="path3105" 41.441 - d="M 291.07142,301.64789 L 309.28571,301.64789" 41.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" /> 41.443 - </g> 41.444 - <path 41.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" 41.446 - d="M 300.53571,486.38926 L 300.53571,409.60355" 41.447 - id="path3113" /> 41.448 - <path 41.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" 41.450 - d="M 291.25,488.49641 L 309.46429,488.49641" 41.451 - id="path3115" /> 41.452 - <text 41.453 - xml:space="preserve" 41.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" 41.455 - x="480.71429" 41.456 - y="250.91507" 41.457 - id="text1949"><tspan 41.458 - sodipodi:role="line" 41.459 - id="tspan1951" 41.460 - x="480.71429" 41.461 - y="250.91507" 41.462 - style="text-align:start;text-anchor:start">head revision</tspan><tspan 41.463 - sodipodi:role="line" 41.464 - x="480.71429" 41.465 - y="265.91507" 41.466 - id="tspan1953" 41.467 - style="text-align:start;text-anchor:start">(has no children)</tspan></text> 41.468 - </g> 41.469 -</svg>
42.1 --- a/en/undo-manual-merge.dot Tue Mar 10 21:42:19 2009 -0700 42.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 42.3 @@ -1,8 +0,0 @@ 42.4 -digraph undo_manual { 42.5 - "first change" -> "second change"; 42.6 - "second change" -> "third change"; 42.7 - backout [label="back out\nsecond change", shape=box]; 42.8 - "second change" -> backout; 42.9 - "third change" -> "manual\nmerge"; 42.10 - backout -> "manual\nmerge"; 42.11 -}
43.1 --- a/en/undo-manual.dot Tue Mar 10 21:42:19 2009 -0700 43.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 43.3 @@ -1,6 +0,0 @@ 43.4 -digraph undo_manual { 43.5 - "first change" -> "second change"; 43.6 - "second change" -> "third change"; 43.7 - backout [label="back out\nsecond change", shape=box]; 43.8 - "second change" -> backout; 43.9 -}
44.1 --- a/en/undo-non-tip.dot Tue Mar 10 21:42:19 2009 -0700 44.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 44.3 @@ -1,9 +0,0 @@ 44.4 -digraph undo_non_tip { 44.5 - "first change" -> "second change"; 44.6 - "second change" -> "third change"; 44.7 - backout [label="back out\nsecond change", shape=box]; 44.8 - "second change" -> backout; 44.9 - merge [label="automated\nmerge", shape=box]; 44.10 - "third change" -> merge; 44.11 - backout -> merge; 44.12 -}
45.1 --- a/en/undo-simple.dot Tue Mar 10 21:42:19 2009 -0700 45.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 45.3 @@ -1,4 +0,0 @@ 45.4 -digraph undo_simple { 45.5 - "first change" -> "second change"; 45.6 - "second change" -> "back out\nsecond change"; 45.7 -}
46.1 --- a/en/wdir-after-commit.svg Tue Mar 10 21:42:19 2009 -0700 46.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 46.3 @@ -1,394 +0,0 @@ 46.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 46.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 46.6 -<svg 46.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 46.8 - xmlns:cc="http://web.resource.org/cc/" 46.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 46.10 - xmlns:svg="http://www.w3.org/2000/svg" 46.11 - xmlns="http://www.w3.org/2000/svg" 46.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 46.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 46.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 46.15 - width="744.09448819" 46.16 - height="1052.3622047" 46.17 - id="svg5971" 46.18 - sodipodi:version="0.32" 46.19 - inkscape:version="0.44.1" 46.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 46.21 - sodipodi:docname="wdir-after-commit.svg"> 46.22 - <defs 46.23 - id="defs5973"> 46.24 - <linearGradient 46.25 - inkscape:collect="always" 46.26 - xlink:href="#linearGradient6049" 46.27 - id="linearGradient6445" 46.28 - gradientUnits="userSpaceOnUse" 46.29 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 46.30 - x1="333.91171" 46.31 - y1="488.79077" 46.32 - x2="508.94543" 46.33 - y2="263.79077" /> 46.34 - <marker 46.35 - inkscape:stockid="Arrow1Mstart" 46.36 - orient="auto" 46.37 - refY="0.0" 46.38 - refX="0.0" 46.39 - id="Arrow1Mstart" 46.40 - style="overflow:visible"> 46.41 - <path 46.42 - id="path4855" 46.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 " 46.44 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 46.45 - transform="scale(0.4) translate(10,0)" /> 46.46 - </marker> 46.47 - <linearGradient 46.48 - id="linearGradient6049"> 46.49 - <stop 46.50 - style="stop-color:#686868;stop-opacity:1;" 46.51 - offset="0" 46.52 - id="stop6051" /> 46.53 - <stop 46.54 - style="stop-color:#f0f0f0;stop-opacity:1;" 46.55 - offset="1" 46.56 - id="stop6053" /> 46.57 - </linearGradient> 46.58 - <marker 46.59 - inkscape:stockid="Arrow1Mend" 46.60 - orient="auto" 46.61 - refY="0.0" 46.62 - refX="0.0" 46.63 - id="Arrow1Mend" 46.64 - style="overflow:visible;"> 46.65 - <path 46.66 - id="path4852" 46.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 " 46.68 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 46.69 - transform="scale(0.4) rotate(180) translate(10,0)" /> 46.70 - </marker> 46.71 - <linearGradient 46.72 - inkscape:collect="always" 46.73 - xlink:href="#linearGradient6049" 46.74 - id="linearGradient6083" 46.75 - gradientUnits="userSpaceOnUse" 46.76 - gradientTransform="translate(-240.0462,-8.633237e-6)" 46.77 - x1="333.91171" 46.78 - y1="488.79077" 46.79 - x2="508.94543" 46.80 - y2="263.79077" /> 46.81 - <linearGradient 46.82 - inkscape:collect="always" 46.83 - xlink:href="#linearGradient6049" 46.84 - id="linearGradient6142" 46.85 - gradientUnits="userSpaceOnUse" 46.86 - gradientTransform="translate(-42.00893,-30.49544)" 46.87 - x1="333.91171" 46.88 - y1="488.79077" 46.89 - x2="508.94543" 46.90 - y2="263.79077" /> 46.91 - <linearGradient 46.92 - inkscape:collect="always" 46.93 - xlink:href="#linearGradient6049" 46.94 - id="linearGradient6193" 46.95 - gradientUnits="userSpaceOnUse" 46.96 - gradientTransform="translate(-240.0462,-8.633237e-6)" 46.97 - x1="333.91171" 46.98 - y1="488.79077" 46.99 - x2="508.94543" 46.100 - y2="263.79077" /> 46.101 - <linearGradient 46.102 - inkscape:collect="always" 46.103 - xlink:href="#linearGradient6049" 46.104 - id="linearGradient6216" 46.105 - gradientUnits="userSpaceOnUse" 46.106 - gradientTransform="translate(-6.0462,-0.664361)" 46.107 - x1="333.91171" 46.108 - y1="488.79077" 46.109 - x2="508.94543" 46.110 - y2="263.79077" /> 46.111 - <linearGradient 46.112 - inkscape:collect="always" 46.113 - xlink:href="#linearGradient6049" 46.114 - id="linearGradient6232" 46.115 - gradientUnits="userSpaceOnUse" 46.116 - gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 46.117 - x1="333.91171" 46.118 - y1="488.79077" 46.119 - x2="508.94543" 46.120 - y2="263.79077" /> 46.121 - <linearGradient 46.122 - inkscape:collect="always" 46.123 - xlink:href="#linearGradient6049" 46.124 - id="linearGradient6772" 46.125 - gradientUnits="userSpaceOnUse" 46.126 - gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 46.127 - x1="333.91171" 46.128 - y1="488.79077" 46.129 - x2="508.94543" 46.130 - y2="263.79077" /> 46.131 - </defs> 46.132 - <sodipodi:namedview 46.133 - id="base" 46.134 - pagecolor="#ffffff" 46.135 - bordercolor="#666666" 46.136 - borderopacity="1.0" 46.137 - gridtolerance="10000" 46.138 - guidetolerance="10" 46.139 - objecttolerance="10" 46.140 - inkscape:pageopacity="0.0" 46.141 - inkscape:pageshadow="2" 46.142 - inkscape:zoom="0.90509668" 46.143 - inkscape:cx="390.0539" 46.144 - inkscape:cy="690.49342" 46.145 - inkscape:document-units="px" 46.146 - inkscape:current-layer="layer1" 46.147 - showguides="true" 46.148 - inkscape:guide-bbox="true" 46.149 - inkscape:window-width="906" 46.150 - inkscape:window-height="620" 46.151 - inkscape:window-x="0" 46.152 - inkscape:window-y="25"> 46.153 - <sodipodi:guide 46.154 - orientation="vertical" 46.155 - position="-1.4285714" 46.156 - id="guide6022" /> 46.157 - </sodipodi:namedview> 46.158 - <metadata 46.159 - id="metadata5976"> 46.160 - <rdf:RDF> 46.161 - <cc:Work 46.162 - rdf:about=""> 46.163 - <dc:format>image/svg+xml</dc:format> 46.164 - <dc:type 46.165 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 46.166 - </cc:Work> 46.167 - </rdf:RDF> 46.168 - </metadata> 46.169 - <g 46.170 - inkscape:label="Layer 1" 46.171 - inkscape:groupmode="layer" 46.172 - id="layer1"> 46.173 - <rect 46.174 - y="245.98355" 46.175 - x="328.23956" 46.176 - height="258.57144" 46.177 - width="174.28572" 46.178 - id="rect6047" 46.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" /> 46.180 - <g 46.181 - id="g6261" 46.182 - transform="translate(234,0)"> 46.183 - <rect 46.184 - y="258.7149" 46.185 - x="114.11369" 46.186 - height="44.537449" 46.187 - width="134.53746" 46.188 - id="rect5983" 46.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" /> 46.190 - <text 46.191 - id="text5985" 46.192 - y="284.47562" 46.193 - x="138.7962" 46.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" 46.195 - xml:space="preserve"><tspan 46.196 - style="font-family:Courier" 46.197 - y="284.47562" 46.198 - x="138.7962" 46.199 - id="tspan5987" 46.200 - sodipodi:role="line">dfbbb33f3fa3</tspan></text> 46.201 - </g> 46.202 - <rect 46.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" 46.204 - id="rect5996" 46.205 - width="134.53746" 46.206 - height="44.537449" 46.207 - x="348.11371" 46.208 - y="320.38159" /> 46.209 - <text 46.210 - xml:space="preserve" 46.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" 46.212 - x="372.7962" 46.213 - y="346.1423" 46.214 - id="text5998"><tspan 46.215 - sodipodi:role="line" 46.216 - id="tspan6000" 46.217 - x="372.7962" 46.218 - y="346.1423" 46.219 - style="font-family:Courier">e7639888bb2f</tspan></text> 46.220 - <rect 46.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" 46.222 - id="rect6004" 46.223 - width="134.53746" 46.224 - height="44.537449" 46.225 - x="348.11371" 46.226 - y="382.04825" /> 46.227 - <text 46.228 - xml:space="preserve" 46.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" 46.230 - x="370.65421" 46.231 - y="407.80896" 46.232 - id="text6006"><tspan 46.233 - sodipodi:role="line" 46.234 - id="tspan6008" 46.235 - x="370.65421" 46.236 - y="407.80896" 46.237 - style="font-family:Courier">7b064d8bac5e</tspan></text> 46.238 - <path 46.239 - inkscape:connector-type="polyline" 46.240 - id="path6018" 46.241 - d="M 415.38242,303.62646 L 415.38242,320.00744" 46.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" /> 46.243 - <path 46.244 - inkscape:connection-end="#rect6004" 46.245 - inkscape:connector-type="polyline" 46.246 - id="path6020" 46.247 - d="M 415.38242,365.29315 L 415.38243,381.67412" 46.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" /> 46.249 - <rect 46.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" 46.251 - id="rect6039" 46.252 - width="134.53746" 46.253 - height="44.537449" 46.254 - x="348.11359" 46.255 - y="443.71487" /> 46.256 - <text 46.257 - xml:space="preserve" 46.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" 46.259 - x="372.79706" 46.260 - y="469.47556" 46.261 - id="text6041"><tspan 46.262 - sodipodi:role="line" 46.263 - id="tspan6043" 46.264 - x="372.79706" 46.265 - y="469.47556" 46.266 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 46.267 - <path 46.268 - inkscape:connection-end="#rect6039" 46.269 - inkscape:connector-type="polyline" 46.270 - id="path6045" 46.271 - d="M 415.38238,426.95981 L 415.38235,443.34087" 46.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" /> 46.273 - <text 46.274 - xml:space="preserve" 46.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" 46.276 - x="327.66046" 46.277 - y="231.36218" 46.278 - id="text6102"><tspan 46.279 - sodipodi:role="line" 46.280 - id="tspan6104" 46.281 - x="327.66046" 46.282 - y="231.36218">History in repository</tspan></text> 46.283 - <rect 46.284 - y="245.94225" 46.285 - x="557.28418" 46.286 - height="204.51619" 46.287 - width="174.36833" 46.288 - id="rect6140" 46.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" /> 46.290 - <g 46.291 - id="g6130" 46.292 - transform="translate(262.3254,24.38544)"> 46.293 - <rect 46.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" 46.295 - id="rect6106" 46.296 - width="134.53746" 46.297 - height="44.537449" 46.298 - x="314.87415" 46.299 - y="257.95059" /> 46.300 - <text 46.301 - xml:space="preserve" 46.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" 46.303 - x="339.55664" 46.304 - y="283.7113" 46.305 - id="text6108"><tspan 46.306 - sodipodi:role="line" 46.307 - id="tspan6110" 46.308 - x="339.55664" 46.309 - y="283.7113" 46.310 - style="font-family:Courier">dfbbb33f3fa3</tspan></text> 46.311 - </g> 46.312 - <g 46.313 - id="g6135" 46.314 - transform="translate(263.0396,49.83106)"> 46.315 - <rect 46.316 - inkscape:transform-center-y="102.85714" 46.317 - inkscape:transform-center-x="129.28571" 46.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" 46.319 - id="rect6112" 46.320 - width="134.53746" 46.321 - height="44.537449" 46.322 - x="314.15985" 46.323 - y="326.52203" /> 46.324 - <text 46.325 - inkscape:transform-center-y="102.7311" 46.326 - inkscape:transform-center-x="128.69672" 46.327 - xml:space="preserve" 46.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" 46.329 - x="338.84335" 46.330 - y="352.28271" 46.331 - id="text6114"><tspan 46.332 - sodipodi:role="line" 46.333 - id="tspan6116" 46.334 - x="338.84335" 46.335 - y="352.28271" 46.336 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 46.337 - </g> 46.338 - <text 46.339 - xml:space="preserve" 46.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" 46.341 - x="576.63208" 46.342 - y="270.479" 46.343 - id="text6118"><tspan 46.344 - sodipodi:role="line" 46.345 - id="tspan6120" 46.346 - x="576.63208" 46.347 - y="270.479">First parent</tspan></text> 46.348 - <text 46.349 - xml:space="preserve" 46.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" 46.351 - x="576.07544" 46.352 - y="364.49615" 46.353 - id="text6122"><tspan 46.354 - sodipodi:role="line" 46.355 - id="tspan6124" 46.356 - x="576.07544" 46.357 - y="364.49615">Second parent</tspan></text> 46.358 - <text 46.359 - xml:space="preserve" 46.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" 46.361 - x="556.61743" 46.362 - y="231.36218" 46.363 - id="text6195"><tspan 46.364 - sodipodi:role="line" 46.365 - id="tspan6197" 46.366 - x="556.61743" 46.367 - y="231.36218">Parents of working directory</tspan></text> 46.368 - <path 46.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" 46.370 - d="M 576.82542,297.63008 L 483.02528,287.95831" 46.371 - id="path6266" 46.372 - inkscape:connector-type="polyline" 46.373 - inkscape:connection-start="#g6130" 46.374 - inkscape:connection-end="#g6261" /> 46.375 - <path 46.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" 46.377 - d="M 665.12232,418.17579 L 665.12232,418.17579" 46.378 - id="path6270" 46.379 - inkscape:connector-type="polyline" /> 46.380 - <text 46.381 - xml:space="preserve" 46.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" 46.383 - x="316.86407" 46.384 - y="275.6496" 46.385 - id="text6573"><tspan 46.386 - sodipodi:role="line" 46.387 - id="tspan6575" 46.388 - x="316.86407" 46.389 - y="275.6496" 46.390 - style="text-align:end;text-anchor:end">New</tspan><tspan 46.391 - sodipodi:role="line" 46.392 - x="316.86407" 46.393 - y="290.6496" 46.394 - id="tspan6577" 46.395 - style="text-align:end;text-anchor:end">changeset</tspan></text> 46.396 - </g> 46.397 -</svg>
47.1 --- a/en/wdir-branch.svg Tue Mar 10 21:42:19 2009 -0700 47.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 47.3 @@ -1,418 +0,0 @@ 47.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 47.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 47.6 -<svg 47.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 47.8 - xmlns:cc="http://web.resource.org/cc/" 47.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 47.10 - xmlns:svg="http://www.w3.org/2000/svg" 47.11 - xmlns="http://www.w3.org/2000/svg" 47.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 47.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 47.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 47.15 - width="744.09448819" 47.16 - height="1052.3622047" 47.17 - id="svg5971" 47.18 - sodipodi:version="0.32" 47.19 - inkscape:version="0.44.1" 47.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 47.21 - sodipodi:docname="wdir-branch.svg"> 47.22 - <defs 47.23 - id="defs5973"> 47.24 - <marker 47.25 - inkscape:stockid="Arrow1Mstart" 47.26 - orient="auto" 47.27 - refY="0.0" 47.28 - refX="0.0" 47.29 - id="Arrow1Mstart" 47.30 - style="overflow:visible"> 47.31 - <path 47.32 - id="path4855" 47.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 " 47.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 47.35 - transform="scale(0.4) translate(10,0)" /> 47.36 - </marker> 47.37 - <linearGradient 47.38 - id="linearGradient6049"> 47.39 - <stop 47.40 - style="stop-color:#686868;stop-opacity:1;" 47.41 - offset="0" 47.42 - id="stop6051" /> 47.43 - <stop 47.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 47.45 - offset="1" 47.46 - id="stop6053" /> 47.47 - </linearGradient> 47.48 - <marker 47.49 - inkscape:stockid="Arrow1Mend" 47.50 - orient="auto" 47.51 - refY="0.0" 47.52 - refX="0.0" 47.53 - id="Arrow1Mend" 47.54 - style="overflow:visible;"> 47.55 - <path 47.56 - id="path4852" 47.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 " 47.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 47.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 47.60 - </marker> 47.61 - <linearGradient 47.62 - inkscape:collect="always" 47.63 - xlink:href="#linearGradient6049" 47.64 - id="linearGradient6083" 47.65 - gradientUnits="userSpaceOnUse" 47.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 47.67 - x1="333.91171" 47.68 - y1="488.79077" 47.69 - x2="508.94543" 47.70 - y2="263.79077" /> 47.71 - <linearGradient 47.72 - inkscape:collect="always" 47.73 - xlink:href="#linearGradient6049" 47.74 - id="linearGradient6142" 47.75 - gradientUnits="userSpaceOnUse" 47.76 - gradientTransform="translate(-42.00893,-30.49544)" 47.77 - x1="333.91171" 47.78 - y1="488.79077" 47.79 - x2="508.94543" 47.80 - y2="263.79077" /> 47.81 - <linearGradient 47.82 - inkscape:collect="always" 47.83 - xlink:href="#linearGradient6049" 47.84 - id="linearGradient6193" 47.85 - gradientUnits="userSpaceOnUse" 47.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 47.87 - x1="333.91171" 47.88 - y1="488.79077" 47.89 - x2="508.94543" 47.90 - y2="263.79077" /> 47.91 - <linearGradient 47.92 - inkscape:collect="always" 47.93 - xlink:href="#linearGradient6049" 47.94 - id="linearGradient6216" 47.95 - gradientUnits="userSpaceOnUse" 47.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 47.97 - x1="333.91171" 47.98 - y1="488.79077" 47.99 - x2="508.94543" 47.100 - y2="263.79077" /> 47.101 - <linearGradient 47.102 - inkscape:collect="always" 47.103 - xlink:href="#linearGradient6049" 47.104 - id="linearGradient6232" 47.105 - gradientUnits="userSpaceOnUse" 47.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 47.107 - x1="333.91171" 47.108 - y1="488.79077" 47.109 - x2="508.94543" 47.110 - y2="263.79077" /> 47.111 - <linearGradient 47.112 - inkscape:collect="always" 47.113 - xlink:href="#linearGradient6049" 47.114 - id="linearGradient6445" 47.115 - gradientUnits="userSpaceOnUse" 47.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 47.117 - x1="333.91171" 47.118 - y1="488.79077" 47.119 - x2="508.94543" 47.120 - y2="263.79077" /> 47.121 - <linearGradient 47.122 - inkscape:collect="always" 47.123 - xlink:href="#linearGradient6049" 47.124 - id="linearGradient6974" 47.125 - gradientUnits="userSpaceOnUse" 47.126 - gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 47.127 - x1="333.91171" 47.128 - y1="488.79077" 47.129 - x2="508.94543" 47.130 - y2="263.79077" /> 47.131 - <linearGradient 47.132 - inkscape:collect="always" 47.133 - xlink:href="#linearGradient6049" 47.134 - id="linearGradient6996" 47.135 - gradientUnits="userSpaceOnUse" 47.136 - gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 47.137 - x1="333.91171" 47.138 - y1="488.79077" 47.139 - x2="508.94543" 47.140 - y2="263.79077" /> 47.141 - </defs> 47.142 - <sodipodi:namedview 47.143 - id="base" 47.144 - pagecolor="#ffffff" 47.145 - bordercolor="#666666" 47.146 - borderopacity="1.0" 47.147 - gridtolerance="10000" 47.148 - guidetolerance="10" 47.149 - objecttolerance="10" 47.150 - inkscape:pageopacity="0.0" 47.151 - inkscape:pageshadow="2" 47.152 - inkscape:zoom="0.90509668" 47.153 - inkscape:cx="345.85973" 47.154 - inkscape:cy="690.49342" 47.155 - inkscape:document-units="px" 47.156 - inkscape:current-layer="layer1" 47.157 - showguides="true" 47.158 - inkscape:guide-bbox="true" 47.159 - inkscape:window-width="906" 47.160 - inkscape:window-height="620" 47.161 - inkscape:window-x="0" 47.162 - inkscape:window-y="25"> 47.163 - <sodipodi:guide 47.164 - orientation="vertical" 47.165 - position="-1.4285714" 47.166 - id="guide6022" /> 47.167 - </sodipodi:namedview> 47.168 - <metadata 47.169 - id="metadata5976"> 47.170 - <rdf:RDF> 47.171 - <cc:Work 47.172 - rdf:about=""> 47.173 - <dc:format>image/svg+xml</dc:format> 47.174 - <dc:type 47.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 47.176 - </cc:Work> 47.177 - </rdf:RDF> 47.178 - </metadata> 47.179 - <g 47.180 - inkscape:label="Layer 1" 47.181 - inkscape:groupmode="layer" 47.182 - id="layer1"> 47.183 - <rect 47.184 - y="246.06918" 47.185 - x="64.325172" 47.186 - height="204.26233" 47.187 - width="333.2135" 47.188 - id="rect6047" 47.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" /> 47.190 - <g 47.191 - id="g1935"> 47.192 - <rect 47.193 - y="266.24374" 47.194 - x="84.113708" 47.195 - height="44.537449" 47.196 - width="134.53746" 47.197 - id="rect5996" 47.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" /> 47.199 - <text 47.200 - id="text5998" 47.201 - y="292.00446" 47.202 - x="108.7962" 47.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" 47.204 - xml:space="preserve"><tspan 47.205 - style="font-family:Courier" 47.206 - y="292.00446" 47.207 - x="108.7962" 47.208 - id="tspan6000" 47.209 - sodipodi:role="line">e7639888bb2f</tspan></text> 47.210 - </g> 47.211 - <g 47.212 - id="g6976" 47.213 - transform="translate(70,0)"> 47.214 - <rect 47.215 - y="327.9104" 47.216 - x="40.113693" 47.217 - height="44.537449" 47.218 - width="134.53746" 47.219 - id="rect6004" 47.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" /> 47.221 - <text 47.222 - id="text6006" 47.223 - y="353.67111" 47.224 - x="62.654205" 47.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" 47.226 - xml:space="preserve"><tspan 47.227 - style="font-family:Courier" 47.228 - y="353.67111" 47.229 - x="62.654205" 47.230 - id="tspan6008" 47.231 - sodipodi:role="line">7b064d8bac5e</tspan></text> 47.232 - </g> 47.233 - <path 47.234 - inkscape:connector-type="polyline" 47.235 - id="path6020" 47.236 - d="M 160.92915,311.15532 L 167.83571,327.53627" 47.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" 47.238 - inkscape:connection-end="#g6976" 47.239 - inkscape:connection-start="#g1935" /> 47.240 - <rect 47.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" 47.242 - id="rect6039" 47.243 - width="134.53746" 47.244 - height="44.537449" 47.245 - x="110.11359" 47.246 - y="389.57703" /> 47.247 - <text 47.248 - xml:space="preserve" 47.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" 47.250 - x="134.79706" 47.251 - y="415.33771" 47.252 - id="text6041"><tspan 47.253 - sodipodi:role="line" 47.254 - id="tspan6043" 47.255 - x="134.79706" 47.256 - y="415.33771" 47.257 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 47.258 - <path 47.259 - inkscape:connection-end="#rect6039" 47.260 - inkscape:connector-type="polyline" 47.261 - id="path6045" 47.262 - d="M 177.38238,372.82195 L 177.38235,389.20303" 47.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" /> 47.264 - <rect 47.265 - y="245.94225" 47.266 - x="447.28412" 47.267 - height="204.51619" 47.268 - width="174.36833" 47.269 - id="rect6140" 47.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" /> 47.271 - <g 47.272 - id="g6130" 47.273 - transform="translate(152.3254,24.38544)"> 47.274 - <rect 47.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" 47.276 - id="rect6106" 47.277 - width="134.53746" 47.278 - height="44.537449" 47.279 - x="314.87415" 47.280 - y="257.95059" /> 47.281 - <text 47.282 - xml:space="preserve" 47.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" 47.284 - x="339.55664" 47.285 - y="283.7113" 47.286 - id="text6108"><tspan 47.287 - sodipodi:role="line" 47.288 - id="tspan6110" 47.289 - x="339.55664" 47.290 - y="283.7113" 47.291 - style="font-family:Courier">ffb20e1701ea</tspan></text> 47.292 - </g> 47.293 - <g 47.294 - id="g6135" 47.295 - transform="translate(153.0396,49.83106)"> 47.296 - <rect 47.297 - inkscape:transform-center-y="102.85714" 47.298 - inkscape:transform-center-x="129.28571" 47.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" 47.300 - id="rect6112" 47.301 - width="134.53746" 47.302 - height="44.537449" 47.303 - x="314.15985" 47.304 - y="326.52203" /> 47.305 - <text 47.306 - inkscape:transform-center-y="102.7311" 47.307 - inkscape:transform-center-x="128.69672" 47.308 - xml:space="preserve" 47.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" 47.310 - x="338.84335" 47.311 - y="352.28271" 47.312 - id="text6114"><tspan 47.313 - sodipodi:role="line" 47.314 - id="tspan6116" 47.315 - x="338.84335" 47.316 - y="352.28271" 47.317 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 47.318 - </g> 47.319 - <text 47.320 - xml:space="preserve" 47.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" 47.322 - x="466.63208" 47.323 - y="270.479" 47.324 - id="text6118"><tspan 47.325 - sodipodi:role="line" 47.326 - id="tspan6120" 47.327 - x="466.63208" 47.328 - y="270.479">First parent</tspan></text> 47.329 - <text 47.330 - xml:space="preserve" 47.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" 47.332 - x="466.07544" 47.333 - y="364.49615" 47.334 - id="text6122"><tspan 47.335 - sodipodi:role="line" 47.336 - id="tspan6124" 47.337 - x="466.07544" 47.338 - y="364.49615">Second parent</tspan></text> 47.339 - <text 47.340 - xml:space="preserve" 47.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" 47.342 - x="446.61743" 47.343 - y="231.36218" 47.344 - id="text6195"><tspan 47.345 - sodipodi:role="line" 47.346 - id="tspan6197" 47.347 - x="446.61743" 47.348 - y="231.36218">Parents of working directory</tspan></text> 47.349 - <path 47.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" 47.351 - d="M 466.82542,300.21999 L 377.00207,294.39744" 47.352 - id="path6266" 47.353 - inkscape:connector-type="polyline" 47.354 - inkscape:connection-start="#g6130" 47.355 - inkscape:connection-end="#rect1925" /> 47.356 - <path 47.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" 47.358 - d="M 665.12232,418.17579 L 665.12232,418.17579" 47.359 - id="path6270" 47.360 - inkscape:connector-type="polyline" /> 47.361 - <g 47.362 - id="g2845"> 47.363 - <rect 47.364 - y="266.24374" 47.365 - x="242.09048" 47.366 - height="44.537449" 47.367 - width="134.53746" 47.368 - id="rect1925" 47.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" /> 47.370 - <text 47.371 - id="text1927" 47.372 - y="292.00446" 47.373 - x="266.77298" 47.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" 47.375 - xml:space="preserve"><tspan 47.376 - style="font-family:Courier" 47.377 - y="292.00446" 47.378 - x="266.77298" 47.379 - id="tspan1929" 47.380 - sodipodi:role="line">ffb20e1701ea</tspan></text> 47.381 - </g> 47.382 - <path 47.383 - inkscape:connector-type="polyline" 47.384 - id="path1933" 47.385 - d="M 260.89978,311.15532 L 225.84185,327.53627" 47.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" 47.387 - inkscape:connection-end="#g6976" /> 47.388 - <text 47.389 - xml:space="preserve" 47.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" 47.391 - x="109.45568" 47.392 - y="231.4554" 47.393 - id="text2837"><tspan 47.394 - sodipodi:role="line" 47.395 - id="tspan2839" 47.396 - x="109.45568" 47.397 - y="231.4554">Pre-existing head</tspan></text> 47.398 - <text 47.399 - xml:space="preserve" 47.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" 47.401 - x="237.54184" 47.402 - y="231.4554" 47.403 - id="text2841"><tspan 47.404 - sodipodi:role="line" 47.405 - id="tspan2843" 47.406 - x="237.54184" 47.407 - y="231.4554">Newly created head (and tip)</tspan></text> 47.408 - <path 47.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)" 47.410 - d="M 148.05048,235.87482 L 149.94915,265.86962" 47.411 - id="path2850" 47.412 - inkscape:connector-type="polyline" 47.413 - inkscape:connection-end="#g1935" /> 47.414 - <path 47.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)" 47.416 - d="M 303.83495,238.08453 L 306.87874,265.86962" 47.417 - id="path2852" 47.418 - inkscape:connector-type="polyline" 47.419 - inkscape:connection-end="#g2845" /> 47.420 - </g> 47.421 -</svg>
48.1 --- a/en/wdir-merge.svg Tue Mar 10 21:42:19 2009 -0700 48.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 48.3 @@ -1,425 +0,0 @@ 48.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 48.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 48.6 -<svg 48.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 48.8 - xmlns:cc="http://web.resource.org/cc/" 48.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 48.10 - xmlns:svg="http://www.w3.org/2000/svg" 48.11 - xmlns="http://www.w3.org/2000/svg" 48.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 48.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 48.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 48.15 - width="744.09448819" 48.16 - height="1052.3622047" 48.17 - id="svg5971" 48.18 - sodipodi:version="0.32" 48.19 - inkscape:version="0.44.1" 48.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 48.21 - sodipodi:docname="wdir-merge.svg"> 48.22 - <defs 48.23 - id="defs5973"> 48.24 - <marker 48.25 - inkscape:stockid="Arrow1Mstart" 48.26 - orient="auto" 48.27 - refY="0.0" 48.28 - refX="0.0" 48.29 - id="Arrow1Mstart" 48.30 - style="overflow:visible"> 48.31 - <path 48.32 - id="path4855" 48.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 " 48.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 48.35 - transform="scale(0.4) translate(10,0)" /> 48.36 - </marker> 48.37 - <linearGradient 48.38 - id="linearGradient6049"> 48.39 - <stop 48.40 - style="stop-color:#686868;stop-opacity:1;" 48.41 - offset="0" 48.42 - id="stop6051" /> 48.43 - <stop 48.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 48.45 - offset="1" 48.46 - id="stop6053" /> 48.47 - </linearGradient> 48.48 - <marker 48.49 - inkscape:stockid="Arrow1Mend" 48.50 - orient="auto" 48.51 - refY="0.0" 48.52 - refX="0.0" 48.53 - id="Arrow1Mend" 48.54 - style="overflow:visible;"> 48.55 - <path 48.56 - id="path4852" 48.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 " 48.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 48.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 48.60 - </marker> 48.61 - <linearGradient 48.62 - inkscape:collect="always" 48.63 - xlink:href="#linearGradient6049" 48.64 - id="linearGradient6083" 48.65 - gradientUnits="userSpaceOnUse" 48.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 48.67 - x1="333.91171" 48.68 - y1="488.79077" 48.69 - x2="508.94543" 48.70 - y2="263.79077" /> 48.71 - <linearGradient 48.72 - inkscape:collect="always" 48.73 - xlink:href="#linearGradient6049" 48.74 - id="linearGradient6142" 48.75 - gradientUnits="userSpaceOnUse" 48.76 - gradientTransform="translate(-42.00893,-30.49544)" 48.77 - x1="333.91171" 48.78 - y1="488.79077" 48.79 - x2="508.94543" 48.80 - y2="263.79077" /> 48.81 - <linearGradient 48.82 - inkscape:collect="always" 48.83 - xlink:href="#linearGradient6049" 48.84 - id="linearGradient6193" 48.85 - gradientUnits="userSpaceOnUse" 48.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 48.87 - x1="333.91171" 48.88 - y1="488.79077" 48.89 - x2="508.94543" 48.90 - y2="263.79077" /> 48.91 - <linearGradient 48.92 - inkscape:collect="always" 48.93 - xlink:href="#linearGradient6049" 48.94 - id="linearGradient6216" 48.95 - gradientUnits="userSpaceOnUse" 48.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 48.97 - x1="333.91171" 48.98 - y1="488.79077" 48.99 - x2="508.94543" 48.100 - y2="263.79077" /> 48.101 - <linearGradient 48.102 - inkscape:collect="always" 48.103 - xlink:href="#linearGradient6049" 48.104 - id="linearGradient6232" 48.105 - gradientUnits="userSpaceOnUse" 48.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 48.107 - x1="333.91171" 48.108 - y1="488.79077" 48.109 - x2="508.94543" 48.110 - y2="263.79077" /> 48.111 - <linearGradient 48.112 - inkscape:collect="always" 48.113 - xlink:href="#linearGradient6049" 48.114 - id="linearGradient6445" 48.115 - gradientUnits="userSpaceOnUse" 48.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 48.117 - x1="333.91171" 48.118 - y1="488.79077" 48.119 - x2="508.94543" 48.120 - y2="263.79077" /> 48.121 - <linearGradient 48.122 - inkscape:collect="always" 48.123 - xlink:href="#linearGradient6049" 48.124 - id="linearGradient6974" 48.125 - gradientUnits="userSpaceOnUse" 48.126 - gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 48.127 - x1="333.91171" 48.128 - y1="488.79077" 48.129 - x2="508.94543" 48.130 - y2="263.79077" /> 48.131 - <linearGradient 48.132 - inkscape:collect="always" 48.133 - xlink:href="#linearGradient6049" 48.134 - id="linearGradient6996" 48.135 - gradientUnits="userSpaceOnUse" 48.136 - gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 48.137 - x1="333.91171" 48.138 - y1="488.79077" 48.139 - x2="508.94543" 48.140 - y2="263.79077" /> 48.141 - </defs> 48.142 - <sodipodi:namedview 48.143 - id="base" 48.144 - pagecolor="#ffffff" 48.145 - bordercolor="#666666" 48.146 - borderopacity="1.0" 48.147 - gridtolerance="10000" 48.148 - guidetolerance="10" 48.149 - objecttolerance="10" 48.150 - inkscape:pageopacity="0.0" 48.151 - inkscape:pageshadow="2" 48.152 - inkscape:zoom="1.28" 48.153 - inkscape:cx="345.85973" 48.154 - inkscape:cy="690.49342" 48.155 - inkscape:document-units="px" 48.156 - inkscape:current-layer="layer1" 48.157 - showguides="true" 48.158 - inkscape:guide-bbox="true" 48.159 - inkscape:window-width="906" 48.160 - inkscape:window-height="620" 48.161 - inkscape:window-x="0" 48.162 - inkscape:window-y="25"> 48.163 - <sodipodi:guide 48.164 - orientation="vertical" 48.165 - position="-1.4285714" 48.166 - id="guide6022" /> 48.167 - </sodipodi:namedview> 48.168 - <metadata 48.169 - id="metadata5976"> 48.170 - <rdf:RDF> 48.171 - <cc:Work 48.172 - rdf:about=""> 48.173 - <dc:format>image/svg+xml</dc:format> 48.174 - <dc:type 48.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 48.176 - </cc:Work> 48.177 - </rdf:RDF> 48.178 - </metadata> 48.179 - <g 48.180 - inkscape:label="Layer 1" 48.181 - inkscape:groupmode="layer" 48.182 - id="layer1"> 48.183 - <rect 48.184 - y="246.06918" 48.185 - x="64.325172" 48.186 - height="204.26233" 48.187 - width="333.2135" 48.188 - id="rect6047" 48.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" /> 48.190 - <g 48.191 - id="g6976" 48.192 - transform="translate(70,0)"> 48.193 - <rect 48.194 - y="327.9104" 48.195 - x="40.113693" 48.196 - height="44.537449" 48.197 - width="134.53746" 48.198 - id="rect6004" 48.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" /> 48.200 - <text 48.201 - id="text6006" 48.202 - y="353.67111" 48.203 - x="62.654205" 48.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" 48.205 - xml:space="preserve"><tspan 48.206 - style="font-family:Courier" 48.207 - y="353.67111" 48.208 - x="62.654205" 48.209 - id="tspan6008" 48.210 - sodipodi:role="line">7b064d8bac5e</tspan></text> 48.211 - </g> 48.212 - <path 48.213 - inkscape:connector-type="polyline" 48.214 - id="path6020" 48.215 - d="M 160.92915,311.15532 L 167.83571,327.53627" 48.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" 48.217 - inkscape:connection-end="#g6976" 48.218 - inkscape:connection-start="#g1935" /> 48.219 - <rect 48.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" 48.221 - id="rect6039" 48.222 - width="134.53746" 48.223 - height="44.537449" 48.224 - x="110.11359" 48.225 - y="389.57703" /> 48.226 - <text 48.227 - xml:space="preserve" 48.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" 48.229 - x="134.79706" 48.230 - y="415.33771" 48.231 - id="text6041"><tspan 48.232 - sodipodi:role="line" 48.233 - id="tspan6043" 48.234 - x="134.79706" 48.235 - y="415.33771" 48.236 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 48.237 - <path 48.238 - inkscape:connection-end="#rect6039" 48.239 - inkscape:connector-type="polyline" 48.240 - id="path6045" 48.241 - d="M 177.38238,372.82195 L 177.38235,389.20303" 48.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" /> 48.243 - <rect 48.244 - y="245.94225" 48.245 - x="447.28412" 48.246 - height="204.51619" 48.247 - width="174.36833" 48.248 - id="rect6140" 48.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" /> 48.250 - <g 48.251 - id="g6130" 48.252 - transform="translate(152.3254,24.38544)"> 48.253 - <rect 48.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" 48.255 - id="rect6106" 48.256 - width="134.53746" 48.257 - height="44.537449" 48.258 - x="314.87415" 48.259 - y="257.95059" /> 48.260 - <text 48.261 - xml:space="preserve" 48.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" 48.263 - x="339.55664" 48.264 - y="283.7113" 48.265 - id="text6108"><tspan 48.266 - sodipodi:role="line" 48.267 - id="tspan6110" 48.268 - x="339.55664" 48.269 - y="283.7113" 48.270 - style="font-family:Courier">ffb20e1701ea</tspan></text> 48.271 - </g> 48.272 - <g 48.273 - id="g6135" 48.274 - transform="translate(153.0396,49.83106)"> 48.275 - <rect 48.276 - inkscape:transform-center-y="102.85714" 48.277 - inkscape:transform-center-x="129.28571" 48.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" 48.279 - id="rect6112" 48.280 - width="134.53746" 48.281 - height="44.537449" 48.282 - x="314.15985" 48.283 - y="326.52203" /> 48.284 - <text 48.285 - inkscape:transform-center-y="102.7311" 48.286 - inkscape:transform-center-x="128.69672" 48.287 - xml:space="preserve" 48.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" 48.289 - x="338.84335" 48.290 - y="352.28271" 48.291 - id="text6114"><tspan 48.292 - sodipodi:role="line" 48.293 - id="tspan6116" 48.294 - x="338.84335" 48.295 - y="352.28271" 48.296 - style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 48.297 - </g> 48.298 - <text 48.299 - xml:space="preserve" 48.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" 48.301 - x="466.63208" 48.302 - y="270.479" 48.303 - id="text6118"><tspan 48.304 - sodipodi:role="line" 48.305 - id="tspan6120" 48.306 - x="466.63208" 48.307 - y="270.479">First parent (unchanged)</tspan></text> 48.308 - <text 48.309 - xml:space="preserve" 48.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" 48.311 - x="466.07544" 48.312 - y="364.49615" 48.313 - id="text6122"><tspan 48.314 - sodipodi:role="line" 48.315 - id="tspan6124" 48.316 - x="466.07544" 48.317 - y="364.49615">Second parent</tspan></text> 48.318 - <text 48.319 - xml:space="preserve" 48.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" 48.321 - x="446.61743" 48.322 - y="231.36218" 48.323 - id="text6195"><tspan 48.324 - sodipodi:role="line" 48.325 - id="tspan6197" 48.326 - x="446.61743" 48.327 - y="231.36218">Parents of working directory</tspan></text> 48.328 - <path 48.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" 48.330 - d="M 466.82542,300.21999 L 377.00207,294.39744" 48.331 - id="path6266" 48.332 - inkscape:connector-type="polyline" 48.333 - inkscape:connection-start="#g6130" 48.334 - inkscape:connection-end="#rect1925" /> 48.335 - <path 48.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" 48.337 - d="M 665.12232,418.17579 L 665.12232,418.17579" 48.338 - id="path6270" 48.339 - inkscape:connector-type="polyline" /> 48.340 - <g 48.341 - id="g2845"> 48.342 - <rect 48.343 - y="266.24374" 48.344 - x="242.09048" 48.345 - height="44.537449" 48.346 - width="134.53746" 48.347 - id="rect1925" 48.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" /> 48.349 - <text 48.350 - id="text1927" 48.351 - y="292.00446" 48.352 - x="266.77298" 48.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" 48.354 - xml:space="preserve"><tspan 48.355 - style="font-family:Courier" 48.356 - y="292.00446" 48.357 - x="266.77298" 48.358 - id="tspan1929" 48.359 - sodipodi:role="line">ffb20e1701ea</tspan></text> 48.360 - </g> 48.361 - <path 48.362 - inkscape:connector-type="polyline" 48.363 - id="path1933" 48.364 - d="M 260.89978,311.15532 L 225.84185,327.53627" 48.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" 48.366 - inkscape:connection-end="#g6976" /> 48.367 - <text 48.368 - xml:space="preserve" 48.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" 48.370 - x="109.45568" 48.371 - y="231.4554" 48.372 - id="text2837"><tspan 48.373 - sodipodi:role="line" 48.374 - id="tspan2839" 48.375 - x="109.45568" 48.376 - y="231.4554">Pre-existing head</tspan></text> 48.377 - <text 48.378 - xml:space="preserve" 48.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" 48.380 - x="237.54184" 48.381 - y="231.4554" 48.382 - id="text2841"><tspan 48.383 - sodipodi:role="line" 48.384 - id="tspan2843" 48.385 - x="237.54184" 48.386 - y="231.4554">Newly created head (and tip)</tspan></text> 48.387 - <path 48.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)" 48.389 - d="M 148.05048,235.87482 L 149.94915,265.86962" 48.390 - id="path2850" 48.391 - inkscape:connector-type="polyline" 48.392 - inkscape:connection-end="#g1935" /> 48.393 - <path 48.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)" 48.395 - d="M 303.83495,238.08453 L 306.87874,265.86962" 48.396 - id="path2852" 48.397 - inkscape:connector-type="polyline" 48.398 - inkscape:connection-end="#g2845" /> 48.399 - <path 48.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" 48.401 - d="M 466.82545,379.17944 L 219.0253,307.95488" 48.402 - id="path3016" 48.403 - inkscape:connector-type="polyline" 48.404 - inkscape:connection-start="#g6135" 48.405 - inkscape:connection-end="#g1935" /> 48.406 - <g 48.407 - id="g1935"> 48.408 - <rect 48.409 - y="266.24374" 48.410 - x="84.113708" 48.411 - height="44.537449" 48.412 - width="134.53746" 48.413 - id="rect5996" 48.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" /> 48.415 - <text 48.416 - id="text5998" 48.417 - y="292.00446" 48.418 - x="108.7962" 48.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" 48.420 - xml:space="preserve"><tspan 48.421 - style="font-family:Courier" 48.422 - y="292.00446" 48.423 - x="108.7962" 48.424 - id="tspan6000" 48.425 - sodipodi:role="line">e7639888bb2f</tspan></text> 48.426 - </g> 48.427 - </g> 48.428 -</svg>
49.1 --- a/en/wdir-pre-branch.svg Tue Mar 10 21:42:19 2009 -0700 49.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 49.3 @@ -1,364 +0,0 @@ 49.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 49.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 49.6 -<svg 49.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 49.8 - xmlns:cc="http://web.resource.org/cc/" 49.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 49.10 - xmlns:svg="http://www.w3.org/2000/svg" 49.11 - xmlns="http://www.w3.org/2000/svg" 49.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 49.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 49.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 49.15 - width="744.09448819" 49.16 - height="1052.3622047" 49.17 - id="svg5971" 49.18 - sodipodi:version="0.32" 49.19 - inkscape:version="0.44.1" 49.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 49.21 - sodipodi:docname="wdir-branch.svg"> 49.22 - <defs 49.23 - id="defs5973"> 49.24 - <marker 49.25 - inkscape:stockid="Arrow1Mstart" 49.26 - orient="auto" 49.27 - refY="0.0" 49.28 - refX="0.0" 49.29 - id="Arrow1Mstart" 49.30 - style="overflow:visible"> 49.31 - <path 49.32 - id="path4855" 49.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 " 49.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 49.35 - transform="scale(0.4) translate(10,0)" /> 49.36 - </marker> 49.37 - <linearGradient 49.38 - id="linearGradient6049"> 49.39 - <stop 49.40 - style="stop-color:#686868;stop-opacity:1;" 49.41 - offset="0" 49.42 - id="stop6051" /> 49.43 - <stop 49.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 49.45 - offset="1" 49.46 - id="stop6053" /> 49.47 - </linearGradient> 49.48 - <marker 49.49 - inkscape:stockid="Arrow1Mend" 49.50 - orient="auto" 49.51 - refY="0.0" 49.52 - refX="0.0" 49.53 - id="Arrow1Mend" 49.54 - style="overflow:visible;"> 49.55 - <path 49.56 - id="path4852" 49.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 " 49.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 49.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 49.60 - </marker> 49.61 - <linearGradient 49.62 - inkscape:collect="always" 49.63 - xlink:href="#linearGradient6049" 49.64 - id="linearGradient6083" 49.65 - gradientUnits="userSpaceOnUse" 49.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 49.67 - x1="333.91171" 49.68 - y1="488.79077" 49.69 - x2="508.94543" 49.70 - y2="263.79077" /> 49.71 - <linearGradient 49.72 - inkscape:collect="always" 49.73 - xlink:href="#linearGradient6049" 49.74 - id="linearGradient6142" 49.75 - gradientUnits="userSpaceOnUse" 49.76 - gradientTransform="translate(-42.00893,-30.49544)" 49.77 - x1="333.91171" 49.78 - y1="488.79077" 49.79 - x2="508.94543" 49.80 - y2="263.79077" /> 49.81 - <linearGradient 49.82 - inkscape:collect="always" 49.83 - xlink:href="#linearGradient6049" 49.84 - id="linearGradient6193" 49.85 - gradientUnits="userSpaceOnUse" 49.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 49.87 - x1="333.91171" 49.88 - y1="488.79077" 49.89 - x2="508.94543" 49.90 - y2="263.79077" /> 49.91 - <linearGradient 49.92 - inkscape:collect="always" 49.93 - xlink:href="#linearGradient6049" 49.94 - id="linearGradient6216" 49.95 - gradientUnits="userSpaceOnUse" 49.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 49.97 - x1="333.91171" 49.98 - y1="488.79077" 49.99 - x2="508.94543" 49.100 - y2="263.79077" /> 49.101 - <linearGradient 49.102 - inkscape:collect="always" 49.103 - xlink:href="#linearGradient6049" 49.104 - id="linearGradient6232" 49.105 - gradientUnits="userSpaceOnUse" 49.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 49.107 - x1="333.91171" 49.108 - y1="488.79077" 49.109 - x2="508.94543" 49.110 - y2="263.79077" /> 49.111 - <linearGradient 49.112 - inkscape:collect="always" 49.113 - xlink:href="#linearGradient6049" 49.114 - id="linearGradient6445" 49.115 - gradientUnits="userSpaceOnUse" 49.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 49.117 - x1="333.91171" 49.118 - y1="488.79077" 49.119 - x2="508.94543" 49.120 - y2="263.79077" /> 49.121 - <linearGradient 49.122 - inkscape:collect="always" 49.123 - xlink:href="#linearGradient6049" 49.124 - id="linearGradient6974" 49.125 - gradientUnits="userSpaceOnUse" 49.126 - gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 49.127 - x1="333.91171" 49.128 - y1="488.79077" 49.129 - x2="508.94543" 49.130 - y2="263.79077" /> 49.131 - <linearGradient 49.132 - inkscape:collect="always" 49.133 - xlink:href="#linearGradient6049" 49.134 - id="linearGradient6996" 49.135 - gradientUnits="userSpaceOnUse" 49.136 - gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 49.137 - x1="333.91171" 49.138 - y1="488.79077" 49.139 - x2="508.94543" 49.140 - y2="263.79077" /> 49.141 - </defs> 49.142 - <sodipodi:namedview 49.143 - id="base" 49.144 - pagecolor="#ffffff" 49.145 - bordercolor="#666666" 49.146 - borderopacity="1.0" 49.147 - gridtolerance="10000" 49.148 - guidetolerance="10" 49.149 - objecttolerance="10" 49.150 - inkscape:pageopacity="0.0" 49.151 - inkscape:pageshadow="2" 49.152 - inkscape:zoom="0.90509668" 49.153 - inkscape:cx="390.0539" 49.154 - inkscape:cy="690.49342" 49.155 - inkscape:document-units="px" 49.156 - inkscape:current-layer="layer1" 49.157 - showguides="true" 49.158 - inkscape:guide-bbox="true" 49.159 - inkscape:window-width="906" 49.160 - inkscape:window-height="620" 49.161 - inkscape:window-x="0" 49.162 - inkscape:window-y="25"> 49.163 - <sodipodi:guide 49.164 - orientation="vertical" 49.165 - position="-1.4285714" 49.166 - id="guide6022" /> 49.167 - </sodipodi:namedview> 49.168 - <metadata 49.169 - id="metadata5976"> 49.170 - <rdf:RDF> 49.171 - <cc:Work 49.172 - rdf:about=""> 49.173 - <dc:format>image/svg+xml</dc:format> 49.174 - <dc:type 49.175 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 49.176 - </cc:Work> 49.177 - </rdf:RDF> 49.178 - </metadata> 49.179 - <g 49.180 - inkscape:label="Layer 1" 49.181 - inkscape:groupmode="layer" 49.182 - id="layer1"> 49.183 - <rect 49.184 - y="245.94225" 49.185 - x="20.198257" 49.186 - height="204.51619" 49.187 - width="174.36833" 49.188 - id="rect6047" 49.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" /> 49.190 - <rect 49.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" 49.192 - id="rect5996" 49.193 - width="134.53746" 49.194 - height="44.537449" 49.195 - x="40.113693" 49.196 - y="266.24374" /> 49.197 - <text 49.198 - xml:space="preserve" 49.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" 49.200 - x="64.796204" 49.201 - y="292.00446" 49.202 - id="text5998"><tspan 49.203 - sodipodi:role="line" 49.204 - id="tspan6000" 49.205 - x="64.796204" 49.206 - y="292.00446" 49.207 - style="font-family:Courier">e7639888bb2f</tspan></text> 49.208 - <g 49.209 - id="g6976"> 49.210 - <rect 49.211 - y="327.9104" 49.212 - x="40.113693" 49.213 - height="44.537449" 49.214 - width="134.53746" 49.215 - id="rect6004" 49.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" /> 49.217 - <text 49.218 - id="text6006" 49.219 - y="353.67111" 49.220 - x="62.654205" 49.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" 49.222 - xml:space="preserve"><tspan 49.223 - style="font-family:Courier" 49.224 - y="353.67111" 49.225 - x="62.654205" 49.226 - id="tspan6008" 49.227 - sodipodi:role="line">7b064d8bac5e</tspan></text> 49.228 - </g> 49.229 - <path 49.230 - inkscape:connection-end="#rect6004" 49.231 - inkscape:connector-type="polyline" 49.232 - id="path6020" 49.233 - d="M 107.38242,311.15529 L 107.38242,327.53626" 49.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" /> 49.235 - <rect 49.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" 49.237 - id="rect6039" 49.238 - width="134.53746" 49.239 - height="44.537449" 49.240 - x="40.113571" 49.241 - y="389.57703" /> 49.242 - <text 49.243 - xml:space="preserve" 49.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" 49.245 - x="64.797073" 49.246 - y="415.33771" 49.247 - id="text6041"><tspan 49.248 - sodipodi:role="line" 49.249 - id="tspan6043" 49.250 - x="64.797073" 49.251 - y="415.33771" 49.252 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 49.253 - <path 49.254 - inkscape:connection-end="#rect6039" 49.255 - inkscape:connector-type="polyline" 49.256 - id="path6045" 49.257 - d="M 107.38238,372.82195 L 107.38235,389.20301" 49.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" /> 49.259 - <text 49.260 - xml:space="preserve" 49.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" 49.262 - x="19.660461" 49.263 - y="231.36218" 49.264 - id="text6102"><tspan 49.265 - sodipodi:role="line" 49.266 - id="tspan6104" 49.267 - x="19.660461" 49.268 - y="231.36218">History in repository</tspan></text> 49.269 - <rect 49.270 - y="245.94225" 49.271 - x="249.28412" 49.272 - height="204.51619" 49.273 - width="174.36833" 49.274 - id="rect6140" 49.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" /> 49.276 - <g 49.277 - id="g6130" 49.278 - transform="translate(-45.67459,24.38544)"> 49.279 - <rect 49.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" 49.281 - id="rect6106" 49.282 - width="134.53746" 49.283 - height="44.537449" 49.284 - x="314.87415" 49.285 - y="257.95059" /> 49.286 - <text 49.287 - xml:space="preserve" 49.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" 49.289 - x="339.55664" 49.290 - y="283.7113" 49.291 - id="text6108"><tspan 49.292 - sodipodi:role="line" 49.293 - id="tspan6110" 49.294 - x="339.55664" 49.295 - y="283.7113" 49.296 - style="font-family:Courier">7b064d8bac5e</tspan></text> 49.297 - </g> 49.298 - <g 49.299 - id="g6135" 49.300 - transform="translate(-44.96042,49.83106)"> 49.301 - <rect 49.302 - inkscape:transform-center-y="102.85714" 49.303 - inkscape:transform-center-x="129.28571" 49.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" 49.305 - id="rect6112" 49.306 - width="134.53746" 49.307 - height="44.537449" 49.308 - x="314.15985" 49.309 - y="326.52203" /> 49.310 - <text 49.311 - inkscape:transform-center-y="102.7311" 49.312 - inkscape:transform-center-x="128.69672" 49.313 - xml:space="preserve" 49.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" 49.315 - x="338.84335" 49.316 - y="352.28271" 49.317 - id="text6114"><tspan 49.318 - sodipodi:role="line" 49.319 - id="tspan6116" 49.320 - x="338.84335" 49.321 - y="352.28271" 49.322 - style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 49.323 - </g> 49.324 - <text 49.325 - xml:space="preserve" 49.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" 49.327 - x="268.63208" 49.328 - y="270.479" 49.329 - id="text6118"><tspan 49.330 - sodipodi:role="line" 49.331 - id="tspan6120" 49.332 - x="268.63208" 49.333 - y="270.479">First parent</tspan></text> 49.334 - <text 49.335 - xml:space="preserve" 49.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" 49.337 - x="268.07544" 49.338 - y="364.49615" 49.339 - id="text6122"><tspan 49.340 - sodipodi:role="line" 49.341 - id="tspan6124" 49.342 - x="268.07544" 49.343 - y="364.49615">Second parent</tspan></text> 49.344 - <text 49.345 - xml:space="preserve" 49.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" 49.347 - x="248.61746" 49.348 - y="231.36218" 49.349 - id="text6195"><tspan 49.350 - sodipodi:role="line" 49.351 - id="tspan6197" 49.352 - x="248.61746" 49.353 - y="231.36218">Parents of working directory</tspan></text> 49.354 - <path 49.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" 49.356 - d="M 268.82543,318.06163 L 175.02528,336.72225" 49.357 - id="path6266" 49.358 - inkscape:connector-type="polyline" 49.359 - inkscape:connection-end="#g6976" 49.360 - inkscape:connection-start="#g6130" /> 49.361 - <path 49.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" 49.363 - d="M 665.12232,418.17579 L 665.12232,418.17579" 49.364 - id="path6270" 49.365 - inkscape:connector-type="polyline" /> 49.366 - </g> 49.367 -</svg>
50.1 --- a/en/wdir.svg Tue Mar 10 21:42:19 2009 -0700 50.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 50.3 @@ -1,348 +0,0 @@ 50.4 -<?xml version="1.0" encoding="UTF-8" standalone="no"?> 50.5 -<!-- Created with Inkscape (http://www.inkscape.org/) --> 50.6 -<svg 50.7 - xmlns:dc="http://purl.org/dc/elements/1.1/" 50.8 - xmlns:cc="http://web.resource.org/cc/" 50.9 - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 50.10 - xmlns:svg="http://www.w3.org/2000/svg" 50.11 - xmlns="http://www.w3.org/2000/svg" 50.12 - xmlns:xlink="http://www.w3.org/1999/xlink" 50.13 - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 50.14 - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 50.15 - width="744.09448819" 50.16 - height="1052.3622047" 50.17 - id="svg5971" 50.18 - sodipodi:version="0.32" 50.19 - inkscape:version="0.44.1" 50.20 - sodipodi:docbase="/home/bos/hg/hgbook/en" 50.21 - sodipodi:docname="wdir.svg"> 50.22 - <defs 50.23 - id="defs5973"> 50.24 - <marker 50.25 - inkscape:stockid="Arrow1Mstart" 50.26 - orient="auto" 50.27 - refY="0.0" 50.28 - refX="0.0" 50.29 - id="Arrow1Mstart" 50.30 - style="overflow:visible"> 50.31 - <path 50.32 - id="path4855" 50.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 " 50.34 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 50.35 - transform="scale(0.4) translate(10,0)" /> 50.36 - </marker> 50.37 - <linearGradient 50.38 - id="linearGradient6049"> 50.39 - <stop 50.40 - style="stop-color:#686868;stop-opacity:1;" 50.41 - offset="0" 50.42 - id="stop6051" /> 50.43 - <stop 50.44 - style="stop-color:#f0f0f0;stop-opacity:1;" 50.45 - offset="1" 50.46 - id="stop6053" /> 50.47 - </linearGradient> 50.48 - <marker 50.49 - inkscape:stockid="Arrow1Mend" 50.50 - orient="auto" 50.51 - refY="0.0" 50.52 - refX="0.0" 50.53 - id="Arrow1Mend" 50.54 - style="overflow:visible;"> 50.55 - <path 50.56 - id="path4852" 50.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 " 50.58 - style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 50.59 - transform="scale(0.4) rotate(180) translate(10,0)" /> 50.60 - </marker> 50.61 - <linearGradient 50.62 - inkscape:collect="always" 50.63 - xlink:href="#linearGradient6049" 50.64 - id="linearGradient6083" 50.65 - gradientUnits="userSpaceOnUse" 50.66 - gradientTransform="translate(-240.0462,-8.633237e-6)" 50.67 - x1="333.91171" 50.68 - y1="488.79077" 50.69 - x2="508.94543" 50.70 - y2="263.79077" /> 50.71 - <linearGradient 50.72 - inkscape:collect="always" 50.73 - xlink:href="#linearGradient6049" 50.74 - id="linearGradient6142" 50.75 - gradientUnits="userSpaceOnUse" 50.76 - gradientTransform="translate(-42.00893,-30.49544)" 50.77 - x1="333.91171" 50.78 - y1="488.79077" 50.79 - x2="508.94543" 50.80 - y2="263.79077" /> 50.81 - <linearGradient 50.82 - inkscape:collect="always" 50.83 - xlink:href="#linearGradient6049" 50.84 - id="linearGradient6193" 50.85 - gradientUnits="userSpaceOnUse" 50.86 - gradientTransform="translate(-240.0462,-8.633237e-6)" 50.87 - x1="333.91171" 50.88 - y1="488.79077" 50.89 - x2="508.94543" 50.90 - y2="263.79077" /> 50.91 - <linearGradient 50.92 - inkscape:collect="always" 50.93 - xlink:href="#linearGradient6049" 50.94 - id="linearGradient6216" 50.95 - gradientUnits="userSpaceOnUse" 50.96 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 50.97 - x1="333.91171" 50.98 - y1="488.79077" 50.99 - x2="508.94543" 50.100 - y2="263.79077" /> 50.101 - <linearGradient 50.102 - inkscape:collect="always" 50.103 - xlink:href="#linearGradient6049" 50.104 - id="linearGradient6232" 50.105 - gradientUnits="userSpaceOnUse" 50.106 - gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 50.107 - x1="333.91171" 50.108 - y1="488.79077" 50.109 - x2="508.94543" 50.110 - y2="263.79077" /> 50.111 - <linearGradient 50.112 - inkscape:collect="always" 50.113 - xlink:href="#linearGradient6049" 50.114 - id="linearGradient6445" 50.115 - gradientUnits="userSpaceOnUse" 50.116 - gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 50.117 - x1="333.91171" 50.118 - y1="488.79077" 50.119 - x2="508.94543" 50.120 - y2="263.79077" /> 50.121 - </defs> 50.122 - <sodipodi:namedview 50.123 - id="base" 50.124 - pagecolor="#ffffff" 50.125 - bordercolor="#666666" 50.126 - borderopacity="1.0" 50.127 - gridtolerance="10000" 50.128 - guidetolerance="10" 50.129 - objecttolerance="10" 50.130 - inkscape:pageopacity="0.0" 50.131 - inkscape:pageshadow="2" 50.132 - inkscape:zoom="0.90509668" 50.133 - inkscape:cx="390.0539" 50.134 - inkscape:cy="690.49342" 50.135 - inkscape:document-units="px" 50.136 - inkscape:current-layer="layer1" 50.137 - showguides="true" 50.138 - inkscape:guide-bbox="true" 50.139 - inkscape:window-width="906" 50.140 - inkscape:window-height="620" 50.141 - inkscape:window-x="0" 50.142 - inkscape:window-y="25"> 50.143 - <sodipodi:guide 50.144 - orientation="vertical" 50.145 - position="-1.4285714" 50.146 - id="guide6022" /> 50.147 - </sodipodi:namedview> 50.148 - <metadata 50.149 - id="metadata5976"> 50.150 - <rdf:RDF> 50.151 - <cc:Work 50.152 - rdf:about=""> 50.153 - <dc:format>image/svg+xml</dc:format> 50.154 - <dc:type 50.155 - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 50.156 - </cc:Work> 50.157 - </rdf:RDF> 50.158 - </metadata> 50.159 - <g 50.160 - inkscape:label="Layer 1" 50.161 - inkscape:groupmode="layer" 50.162 - id="layer1"> 50.163 - <g 50.164 - id="g6431" 50.165 - transform="translate(0,-0.137863)"> 50.166 - <rect 50.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" 50.168 - id="rect6047" 50.169 - width="174.36833" 50.170 - height="204.51619" 50.171 - x="94.198257" 50.172 - y="246.08011" /> 50.173 - <rect 50.174 - y="266.38159" 50.175 - x="114.11369" 50.176 - height="44.537449" 50.177 - width="134.53746" 50.178 - id="rect5996" 50.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" /> 50.180 - <text 50.181 - id="text5998" 50.182 - y="292.1423" 50.183 - x="138.7962" 50.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" 50.185 - xml:space="preserve"><tspan 50.186 - style="font-family:Courier" 50.187 - y="292.1423" 50.188 - x="138.7962" 50.189 - id="tspan6000" 50.190 - sodipodi:role="line">e7639888bb2f</tspan></text> 50.191 - <rect 50.192 - y="328.04825" 50.193 - x="114.11369" 50.194 - height="44.537449" 50.195 - width="134.53746" 50.196 - id="rect6004" 50.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" /> 50.198 - <text 50.199 - id="text6006" 50.200 - y="353.80896" 50.201 - x="136.65421" 50.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" 50.203 - xml:space="preserve"><tspan 50.204 - style="font-family:Courier" 50.205 - y="353.80896" 50.206 - x="136.65421" 50.207 - id="tspan6008" 50.208 - sodipodi:role="line">7b064d8bac5e</tspan></text> 50.209 - <path 50.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" 50.211 - d="M 181.38242,311.29315 L 181.38242,327.67412" 50.212 - id="path6020" 50.213 - inkscape:connector-type="polyline" 50.214 - inkscape:connection-end="#rect6004" /> 50.215 - <rect 50.216 - y="389.71487" 50.217 - x="114.11357" 50.218 - height="44.537449" 50.219 - width="134.53746" 50.220 - id="rect6039" 50.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" /> 50.222 - <text 50.223 - id="text6041" 50.224 - y="415.47556" 50.225 - x="138.79707" 50.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" 50.227 - xml:space="preserve"><tspan 50.228 - style="fill:#979797;fill-opacity:1;font-family:Courier" 50.229 - y="415.47556" 50.230 - x="138.79707" 50.231 - id="tspan6043" 50.232 - sodipodi:role="line">000000000000</tspan></text> 50.233 - <path 50.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" 50.235 - d="M 181.38238,372.95981 L 181.38235,389.34087" 50.236 - id="path6045" 50.237 - inkscape:connector-type="polyline" 50.238 - inkscape:connection-end="#rect6039" /> 50.239 - </g> 50.240 - <text 50.241 - xml:space="preserve" 50.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" 50.243 - x="93.660484" 50.244 - y="231.36218" 50.245 - id="text6102"><tspan 50.246 - sodipodi:role="line" 50.247 - id="tspan6104" 50.248 - x="93.660484" 50.249 - y="231.36218">History in repository</tspan></text> 50.250 - <g 50.251 - id="g6416"> 50.252 - <rect 50.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" 50.254 - id="rect6140" 50.255 - width="174.36833" 50.256 - height="204.51619" 50.257 - x="323.28412" 50.258 - y="245.94225" /> 50.259 - <g 50.260 - transform="translate(28.32541,24.38544)" 50.261 - id="g6130"> 50.262 - <rect 50.263 - y="257.95059" 50.264 - x="314.87415" 50.265 - height="44.537449" 50.266 - width="134.53746" 50.267 - id="rect6106" 50.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" /> 50.269 - <text 50.270 - id="text6108" 50.271 - y="283.7113" 50.272 - x="339.55664" 50.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" 50.274 - xml:space="preserve"><tspan 50.275 - style="font-family:Courier" 50.276 - y="283.7113" 50.277 - x="339.55664" 50.278 - id="tspan6110" 50.279 - sodipodi:role="line">e7639888bb2f</tspan></text> 50.280 - </g> 50.281 - <g 50.282 - transform="translate(29.03958,49.83106)" 50.283 - id="g6135"> 50.284 - <rect 50.285 - y="326.52203" 50.286 - x="314.15985" 50.287 - height="44.537449" 50.288 - width="134.53746" 50.289 - id="rect6112" 50.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" 50.291 - inkscape:transform-center-x="129.28571" 50.292 - inkscape:transform-center-y="102.85714" /> 50.293 - <text 50.294 - id="text6114" 50.295 - y="352.28271" 50.296 - x="338.84335" 50.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" 50.298 - xml:space="preserve" 50.299 - inkscape:transform-center-x="128.69672" 50.300 - inkscape:transform-center-y="102.7311"><tspan 50.301 - style="fill:#979797;fill-opacity:1;font-family:Courier" 50.302 - y="352.28271" 50.303 - x="338.84335" 50.304 - id="tspan6116" 50.305 - sodipodi:role="line">000000000000</tspan></text> 50.306 - </g> 50.307 - <text 50.308 - id="text6118" 50.309 - y="270.479" 50.310 - x="342.63208" 50.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" 50.312 - xml:space="preserve"><tspan 50.313 - y="270.479" 50.314 - x="342.63208" 50.315 - id="tspan6120" 50.316 - sodipodi:role="line">First parent</tspan></text> 50.317 - <text 50.318 - id="text6122" 50.319 - y="364.49615" 50.320 - x="342.07544" 50.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" 50.322 - xml:space="preserve"><tspan 50.323 - y="364.49615" 50.324 - x="342.07544" 50.325 - id="tspan6124" 50.326 - sodipodi:role="line">Second parent</tspan></text> 50.327 - </g> 50.328 - <text 50.329 - xml:space="preserve" 50.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" 50.331 - x="322.61746" 50.332 - y="231.36218" 50.333 - id="text6195"><tspan 50.334 - sodipodi:role="line" 50.335 - id="tspan6197" 50.336 - x="322.61746" 50.337 - y="231.36218">Parents of working directory</tspan></text> 50.338 - <path 50.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" 50.340 - d="M 342.82543,299.89384 L 249.02528,293.36123" 50.341 - id="path6266" 50.342 - inkscape:connector-type="polyline" 50.343 - inkscape:connection-start="#g6130" 50.344 - inkscape:connection-end="#rect5996" /> 50.345 - <path 50.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" 50.347 - d="M 665.12232,418.17579 L 665.12232,418.17579" 50.348 - id="path6270" 50.349 - inkscape:connector-type="polyline" /> 50.350 - </g> 50.351 -</svg>