Mercurial > hgbook
comparison en/images/wdir-merge.svg @ 727:0e3d8f66bbb7
Rename en/figs to en/images
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Thu, 12 Mar 2009 15:58:38 +0800 |
parents | en/figs/wdir-merge.svg@bebd5ff7fe7f |
children |
comparison
equal
deleted
inserted
replaced
726:8271c8891b0e | 727:0e3d8f66bbb7 |
---|---|
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?> | |
2 <!-- Created with Inkscape (http://www.inkscape.org/) --> | |
3 <svg | |
4 xmlns:dc="http://purl.org/dc/elements/1.1/" | |
5 xmlns:cc="http://web.resource.org/cc/" | |
6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | |
7 xmlns:svg="http://www.w3.org/2000/svg" | |
8 xmlns="http://www.w3.org/2000/svg" | |
9 xmlns:xlink="http://www.w3.org/1999/xlink" | |
10 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" | |
11 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" | |
12 width="744.09448819" | |
13 height="1052.3622047" | |
14 id="svg5971" | |
15 sodipodi:version="0.32" | |
16 inkscape:version="0.44.1" | |
17 sodipodi:docbase="/home/bos/hg/hgbook/en" | |
18 sodipodi:docname="wdir-merge.svg"> | |
19 <defs | |
20 id="defs5973"> | |
21 <marker | |
22 inkscape:stockid="Arrow1Mstart" | |
23 orient="auto" | |
24 refY="0.0" | |
25 refX="0.0" | |
26 id="Arrow1Mstart" | |
27 style="overflow:visible"> | |
28 <path | |
29 id="path4855" | |
30 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 " | |
31 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" | |
32 transform="scale(0.4) translate(10,0)" /> | |
33 </marker> | |
34 <linearGradient | |
35 id="linearGradient6049"> | |
36 <stop | |
37 style="stop-color:#686868;stop-opacity:1;" | |
38 offset="0" | |
39 id="stop6051" /> | |
40 <stop | |
41 style="stop-color:#f0f0f0;stop-opacity:1;" | |
42 offset="1" | |
43 id="stop6053" /> | |
44 </linearGradient> | |
45 <marker | |
46 inkscape:stockid="Arrow1Mend" | |
47 orient="auto" | |
48 refY="0.0" | |
49 refX="0.0" | |
50 id="Arrow1Mend" | |
51 style="overflow:visible;"> | |
52 <path | |
53 id="path4852" | |
54 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 " | |
55 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" | |
56 transform="scale(0.4) rotate(180) translate(10,0)" /> | |
57 </marker> | |
58 <linearGradient | |
59 inkscape:collect="always" | |
60 xlink:href="#linearGradient6049" | |
61 id="linearGradient6083" | |
62 gradientUnits="userSpaceOnUse" | |
63 gradientTransform="translate(-240.0462,-8.633237e-6)" | |
64 x1="333.91171" | |
65 y1="488.79077" | |
66 x2="508.94543" | |
67 y2="263.79077" /> | |
68 <linearGradient | |
69 inkscape:collect="always" | |
70 xlink:href="#linearGradient6049" | |
71 id="linearGradient6142" | |
72 gradientUnits="userSpaceOnUse" | |
73 gradientTransform="translate(-42.00893,-30.49544)" | |
74 x1="333.91171" | |
75 y1="488.79077" | |
76 x2="508.94543" | |
77 y2="263.79077" /> | |
78 <linearGradient | |
79 inkscape:collect="always" | |
80 xlink:href="#linearGradient6049" | |
81 id="linearGradient6193" | |
82 gradientUnits="userSpaceOnUse" | |
83 gradientTransform="translate(-240.0462,-8.633237e-6)" | |
84 x1="333.91171" | |
85 y1="488.79077" | |
86 x2="508.94543" | |
87 y2="263.79077" /> | |
88 <linearGradient | |
89 inkscape:collect="always" | |
90 xlink:href="#linearGradient6049" | |
91 id="linearGradient6216" | |
92 gradientUnits="userSpaceOnUse" | |
93 gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" | |
94 x1="333.91171" | |
95 y1="488.79077" | |
96 x2="508.94543" | |
97 y2="263.79077" /> | |
98 <linearGradient | |
99 inkscape:collect="always" | |
100 xlink:href="#linearGradient6049" | |
101 id="linearGradient6232" | |
102 gradientUnits="userSpaceOnUse" | |
103 gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" | |
104 x1="333.91171" | |
105 y1="488.79077" | |
106 x2="508.94543" | |
107 y2="263.79077" /> | |
108 <linearGradient | |
109 inkscape:collect="always" | |
110 xlink:href="#linearGradient6049" | |
111 id="linearGradient6445" | |
112 gradientUnits="userSpaceOnUse" | |
113 gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" | |
114 x1="333.91171" | |
115 y1="488.79077" | |
116 x2="508.94543" | |
117 y2="263.79077" /> | |
118 <linearGradient | |
119 inkscape:collect="always" | |
120 xlink:href="#linearGradient6049" | |
121 id="linearGradient6974" | |
122 gradientUnits="userSpaceOnUse" | |
123 gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" | |
124 x1="333.91171" | |
125 y1="488.79077" | |
126 x2="508.94543" | |
127 y2="263.79077" /> | |
128 <linearGradient | |
129 inkscape:collect="always" | |
130 xlink:href="#linearGradient6049" | |
131 id="linearGradient6996" | |
132 gradientUnits="userSpaceOnUse" | |
133 gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" | |
134 x1="333.91171" | |
135 y1="488.79077" | |
136 x2="508.94543" | |
137 y2="263.79077" /> | |
138 </defs> | |
139 <sodipodi:namedview | |
140 id="base" | |
141 pagecolor="#ffffff" | |
142 bordercolor="#666666" | |
143 borderopacity="1.0" | |
144 gridtolerance="10000" | |
145 guidetolerance="10" | |
146 objecttolerance="10" | |
147 inkscape:pageopacity="0.0" | |
148 inkscape:pageshadow="2" | |
149 inkscape:zoom="1.28" | |
150 inkscape:cx="345.85973" | |
151 inkscape:cy="690.49342" | |
152 inkscape:document-units="px" | |
153 inkscape:current-layer="layer1" | |
154 showguides="true" | |
155 inkscape:guide-bbox="true" | |
156 inkscape:window-width="906" | |
157 inkscape:window-height="620" | |
158 inkscape:window-x="0" | |
159 inkscape:window-y="25"> | |
160 <sodipodi:guide | |
161 orientation="vertical" | |
162 position="-1.4285714" | |
163 id="guide6022" /> | |
164 </sodipodi:namedview> | |
165 <metadata | |
166 id="metadata5976"> | |
167 <rdf:RDF> | |
168 <cc:Work | |
169 rdf:about=""> | |
170 <dc:format>image/svg+xml</dc:format> | |
171 <dc:type | |
172 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | |
173 </cc:Work> | |
174 </rdf:RDF> | |
175 </metadata> | |
176 <g | |
177 inkscape:label="Layer 1" | |
178 inkscape:groupmode="layer" | |
179 id="layer1"> | |
180 <rect | |
181 y="246.06918" | |
182 x="64.325172" | |
183 height="204.26233" | |
184 width="333.2135" | |
185 id="rect6047" | |
186 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" /> | |
187 <g | |
188 id="g6976" | |
189 transform="translate(70,0)"> | |
190 <rect | |
191 y="327.9104" | |
192 x="40.113693" | |
193 height="44.537449" | |
194 width="134.53746" | |
195 id="rect6004" | |
196 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" /> | |
197 <text | |
198 id="text6006" | |
199 y="353.67111" | |
200 x="62.654205" | |
201 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
202 xml:space="preserve"><tspan | |
203 style="font-family:Courier" | |
204 y="353.67111" | |
205 x="62.654205" | |
206 id="tspan6008" | |
207 sodipodi:role="line">7b064d8bac5e</tspan></text> | |
208 </g> | |
209 <path | |
210 inkscape:connector-type="polyline" | |
211 id="path6020" | |
212 d="M 160.92915,311.15532 L 167.83571,327.53627" | |
213 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" | |
214 inkscape:connection-end="#g6976" | |
215 inkscape:connection-start="#g1935" /> | |
216 <rect | |
217 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" | |
218 id="rect6039" | |
219 width="134.53746" | |
220 height="44.537449" | |
221 x="110.11359" | |
222 y="389.57703" /> | |
223 <text | |
224 xml:space="preserve" | |
225 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" | |
226 x="134.79706" | |
227 y="415.33771" | |
228 id="text6041"><tspan | |
229 sodipodi:role="line" | |
230 id="tspan6043" | |
231 x="134.79706" | |
232 y="415.33771" | |
233 style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> | |
234 <path | |
235 inkscape:connection-end="#rect6039" | |
236 inkscape:connector-type="polyline" | |
237 id="path6045" | |
238 d="M 177.38238,372.82195 L 177.38235,389.20303" | |
239 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" /> | |
240 <rect | |
241 y="245.94225" | |
242 x="447.28412" | |
243 height="204.51619" | |
244 width="174.36833" | |
245 id="rect6140" | |
246 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" /> | |
247 <g | |
248 id="g6130" | |
249 transform="translate(152.3254,24.38544)"> | |
250 <rect | |
251 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" | |
252 id="rect6106" | |
253 width="134.53746" | |
254 height="44.537449" | |
255 x="314.87415" | |
256 y="257.95059" /> | |
257 <text | |
258 xml:space="preserve" | |
259 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
260 x="339.55664" | |
261 y="283.7113" | |
262 id="text6108"><tspan | |
263 sodipodi:role="line" | |
264 id="tspan6110" | |
265 x="339.55664" | |
266 y="283.7113" | |
267 style="font-family:Courier">ffb20e1701ea</tspan></text> | |
268 </g> | |
269 <g | |
270 id="g6135" | |
271 transform="translate(153.0396,49.83106)"> | |
272 <rect | |
273 inkscape:transform-center-y="102.85714" | |
274 inkscape:transform-center-x="129.28571" | |
275 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" | |
276 id="rect6112" | |
277 width="134.53746" | |
278 height="44.537449" | |
279 x="314.15985" | |
280 y="326.52203" /> | |
281 <text | |
282 inkscape:transform-center-y="102.7311" | |
283 inkscape:transform-center-x="128.69672" | |
284 xml:space="preserve" | |
285 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" | |
286 x="338.84335" | |
287 y="352.28271" | |
288 id="text6114"><tspan | |
289 sodipodi:role="line" | |
290 id="tspan6116" | |
291 x="338.84335" | |
292 y="352.28271" | |
293 style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> | |
294 </g> | |
295 <text | |
296 xml:space="preserve" | |
297 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
298 x="466.63208" | |
299 y="270.479" | |
300 id="text6118"><tspan | |
301 sodipodi:role="line" | |
302 id="tspan6120" | |
303 x="466.63208" | |
304 y="270.479">First parent (unchanged)</tspan></text> | |
305 <text | |
306 xml:space="preserve" | |
307 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
308 x="466.07544" | |
309 y="364.49615" | |
310 id="text6122"><tspan | |
311 sodipodi:role="line" | |
312 id="tspan6124" | |
313 x="466.07544" | |
314 y="364.49615">Second parent</tspan></text> | |
315 <text | |
316 xml:space="preserve" | |
317 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
318 x="446.61743" | |
319 y="231.36218" | |
320 id="text6195"><tspan | |
321 sodipodi:role="line" | |
322 id="tspan6197" | |
323 x="446.61743" | |
324 y="231.36218">Parents of working directory</tspan></text> | |
325 <path | |
326 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" | |
327 d="M 466.82542,300.21999 L 377.00207,294.39744" | |
328 id="path6266" | |
329 inkscape:connector-type="polyline" | |
330 inkscape:connection-start="#g6130" | |
331 inkscape:connection-end="#rect1925" /> | |
332 <path | |
333 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" | |
334 d="M 665.12232,418.17579 L 665.12232,418.17579" | |
335 id="path6270" | |
336 inkscape:connector-type="polyline" /> | |
337 <g | |
338 id="g2845"> | |
339 <rect | |
340 y="266.24374" | |
341 x="242.09048" | |
342 height="44.537449" | |
343 width="134.53746" | |
344 id="rect1925" | |
345 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" /> | |
346 <text | |
347 id="text1927" | |
348 y="292.00446" | |
349 x="266.77298" | |
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" | |
351 xml:space="preserve"><tspan | |
352 style="font-family:Courier" | |
353 y="292.00446" | |
354 x="266.77298" | |
355 id="tspan1929" | |
356 sodipodi:role="line">ffb20e1701ea</tspan></text> | |
357 </g> | |
358 <path | |
359 inkscape:connector-type="polyline" | |
360 id="path1933" | |
361 d="M 260.89978,311.15532 L 225.84185,327.53627" | |
362 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" | |
363 inkscape:connection-end="#g6976" /> | |
364 <text | |
365 xml:space="preserve" | |
366 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
367 x="109.45568" | |
368 y="231.4554" | |
369 id="text2837"><tspan | |
370 sodipodi:role="line" | |
371 id="tspan2839" | |
372 x="109.45568" | |
373 y="231.4554">Pre-existing head</tspan></text> | |
374 <text | |
375 xml:space="preserve" | |
376 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
377 x="237.54184" | |
378 y="231.4554" | |
379 id="text2841"><tspan | |
380 sodipodi:role="line" | |
381 id="tspan2843" | |
382 x="237.54184" | |
383 y="231.4554">Newly created head (and tip)</tspan></text> | |
384 <path | |
385 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)" | |
386 d="M 148.05048,235.87482 L 149.94915,265.86962" | |
387 id="path2850" | |
388 inkscape:connector-type="polyline" | |
389 inkscape:connection-end="#g1935" /> | |
390 <path | |
391 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)" | |
392 d="M 303.83495,238.08453 L 306.87874,265.86962" | |
393 id="path2852" | |
394 inkscape:connector-type="polyline" | |
395 inkscape:connection-end="#g2845" /> | |
396 <path | |
397 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" | |
398 d="M 466.82545,379.17944 L 219.0253,307.95488" | |
399 id="path3016" | |
400 inkscape:connector-type="polyline" | |
401 inkscape:connection-start="#g6135" | |
402 inkscape:connection-end="#g1935" /> | |
403 <g | |
404 id="g1935"> | |
405 <rect | |
406 y="266.24374" | |
407 x="84.113708" | |
408 height="44.537449" | |
409 width="134.53746" | |
410 id="rect5996" | |
411 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" /> | |
412 <text | |
413 id="text5998" | |
414 y="292.00446" | |
415 x="108.7962" | |
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" | |
417 xml:space="preserve"><tspan | |
418 style="font-family:Courier" | |
419 y="292.00446" | |
420 x="108.7962" | |
421 id="tspan6000" | |
422 sodipodi:role="line">e7639888bb2f</tspan></text> | |
423 </g> | |
424 </g> | |
425 </svg> |