hgbook
view es/tour-merge-merge.svg @ 464:951bf84ca8e2
translated up to the section "testing and troubleshooting"
author | Javier Rojas <jerojasro@devnull.li> |
---|---|
date | Tue Dec 23 18:57:35 2008 -0500 (2008-12-23) |
parents | 04c08ad7e92e |
children |
line source
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://creativecommons.org/ns#"
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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
11 width="744.09448819"
12 height="1052.3622047"
13 id="svg2"
14 sodipodi:version="0.32"
15 inkscape:version="0.46"
16 sodipodi:docname="tour-merge-merge.svg"
17 inkscape:output_extension="org.inkscape.output.svg.inkscape">
18 <defs
19 id="defs4">
20 <inkscape:perspective
21 sodipodi:type="inkscape:persp3d"
22 inkscape:vp_x="0 : 526.18109 : 1"
23 inkscape:vp_y="0 : 1000 : 0"
24 inkscape:vp_z="744.09448 : 526.18109 : 1"
25 inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
26 id="perspective2928" />
27 <marker
28 inkscape:stockid="Arrow1Mstart"
29 orient="auto"
30 refY="0.0"
31 refX="0.0"
32 id="Arrow1Mstart"
33 style="overflow:visible">
34 <path
35 id="path2973"
36 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 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
38 transform="scale(0.4) translate(10,0)" />
39 </marker>
40 <marker
41 inkscape:stockid="Arrow1Mend"
42 orient="auto"
43 refY="0.0"
44 refX="0.0"
45 id="Arrow1Mend"
46 style="overflow:visible;">
47 <path
48 id="path3066"
49 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 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
51 transform="scale(0.4) rotate(180) translate(10,0)" />
52 </marker>
53 </defs>
54 <sodipodi:namedview
55 id="base"
56 pagecolor="#ffffff"
57 bordercolor="#666666"
58 borderopacity="1.0"
59 gridtolerance="10000"
60 guidetolerance="10"
61 objecttolerance="10"
62 inkscape:pageopacity="0.0"
63 inkscape:pageshadow="2"
64 inkscape:zoom="0.98994949"
65 inkscape:cx="328.35015"
66 inkscape:cy="790.24518"
67 inkscape:document-units="px"
68 inkscape:current-layer="layer1"
69 inkscape:window-width="1278"
70 inkscape:window-height="756"
71 inkscape:window-x="0"
72 inkscape:window-y="0"
73 showgrid="false" />
74 <metadata
75 id="metadata7">
76 <rdf:RDF>
77 <cc:Work
78 rdf:about="">
79 <dc:format>image/svg+xml</dc:format>
80 <dc:type
81 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
82 </cc:Work>
83 </rdf:RDF>
84 </metadata>
85 <g
86 inkscape:label="Layer 1"
87 inkscape:groupmode="layer"
88 id="layer1">
89 <rect
90 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"
91 id="rect2995"
92 width="94.285713"
93 height="20.714285"
94 x="532.85718"
95 y="203.0479" />
96 <text
97 xml:space="preserve"
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:Courier"
99 x="173.57143"
100 y="443.79074"
101 id="text2832"><tspan
102 sodipodi:role="line"
103 id="tspan2834"
104 x="173.57143"
105 y="443.79074" /></text>
106 <rect
107 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"
108 id="rect2830"
109 width="94.285713"
110 height="20.714285"
111 x="138"
112 y="297.76227" />
113 <text
114 xml:space="preserve"
115 style="font-size:12px;font-style:normal;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"
116 x="162.09892"
117 y="311.38342"
118 id="text2824"><tspan
119 sodipodi:role="line"
120 id="tspan2826"
121 x="162.09892"
122 y="311.38342"
123 style="font-family:Courier"><tspan
124 style="font-weight:bold"
125 id="tspan2862">4</tspan>: REV4</tspan></text>
126 <path
127 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"
128 d="M 185.14286,343.63731 L 185.14286,319.47656"
129 id="path2900"
130 inkscape:connector-type="polyline" />
131 <rect
132 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"
133 id="rect2863"
134 width="94.285713"
135 height="20.714285"
136 x="91.428574"
137 y="250.47656" />
138 <text
139 xml:space="preserve"
140 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"
141 x="116.09886"
142 y="264.56592"
143 id="text1965"
144 transform="scale(1.000002,0.999998)"><tspan
145 sodipodi:role="line"
146 id="tspan1967"
147 x="116.09886"
148 y="264.56592"
149 style="font-family:Courier"><tspan
150 style="font-weight:bold"
151 id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text>
152 <path
153 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"
154 d="M 173.95727,296.76228 L 149.75702,272.19085"
155 id="path1971"
156 inkscape:connector-type="polyline"
157 inkscape:connection-end="#rect2863"
158 inkscape:connection-start="#rect2830" />
159 <rect
160 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"
161 id="rect2911"
162 width="94.285995"
163 height="20.714283"
164 x="186.71414"
165 y="204.40514" />
166 <text
167 xml:space="preserve"
168 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"
169 x="210.81311"
170 y="218.02673"
171 id="text2913"
172 transform="scale(1.000002,0.999998)"><tspan
173 sodipodi:role="line"
174 id="tspan2915"
175 x="210.81311"
176 y="218.02673"
177 style="font-family:Courier"><tspan
178 id="tspan1966"
179 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text>
180 <path
181 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"
182 d="M 191.06908,296.76228 L 227.93092,226.11942"
183 id="path2919"
184 inkscape:connector-type="polyline"
185 inkscape:connection-start="#rect2830" />
186 <text
187 xml:space="preserve"
188 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"
189 x="295.28571"
190 y="217.56711"
191 id="text2871"
192 sodipodi:linespacing="125%"><tspan
193 sodipodi:role="line"
194 id="tspan2441">punta (y frente)</tspan></text>
195 <text
196 xml:space="preserve"
197 style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
198 x="57.817253"
199 y="263.90753"
200 id="text2875"
201 sodipodi:linespacing="125%"><tspan
202 sodipodi:role="line"
203 id="tspan2439"
204 x="57.817253"
205 y="263.90753">frente</tspan></text>
206 <rect
207 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"
208 id="rect1913"
209 width="94.285713"
210 height="20.714285"
211 x="138"
212 y="156.90514" />
213 <path
214 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"
215 d="M 144.22399,249.47657 L 179.49029,178.61943"
216 id="path1915"
217 inkscape:connector-type="polyline"
218 inkscape:connection-start="#rect2863"
219 inkscape:connection-end="#rect1913" />
220 <path
221 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"
222 d="M 222.20966,203.40514 L 196.79033,178.61943"
223 id="path1917"
224 inkscape:connector-type="polyline"
225 inkscape:connection-start="#rect2911"
226 inkscape:connection-end="#rect1913" />
227 <text
228 xml:space="preserve"
229 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"
230 x="166.16823"
231 y="168.52228"
232 id="text2806"><tspan
233 sodipodi:role="line"
234 id="tspan2808"
235 x="166.16823"
236 y="168.52228"
237 style="font-family:Courier">fusión</tspan></text>
238 <text
239 xml:space="preserve"
240 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"
241 x="246"
242 y="162.63338"
243 id="text2810"><tspan
244 sodipodi:role="line"
245 x="246"
246 y="162.63338"
247 id="tspan2814">directorio de trabajo</tspan><tspan
248 sodipodi:role="line"
249 x="246"
250 y="177.63338"
251 id="tspan3538">durante la fusión</tspan></text>
252 <rect
253 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"
254 id="rect2816"
255 width="94.285713"
256 height="20.714285"
257 x="483.14636"
258 y="297.76227" />
259 <text
260 xml:space="preserve"
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:Courier"
262 x="507.24527"
263 y="311.38342"
264 id="text2818"><tspan
265 sodipodi:role="line"
266 id="tspan2820"
267 x="507.24527"
268 y="311.38342"
269 style="font-family:Courier"><tspan
270 style="font-weight:bold"
271 id="tspan2822">4</tspan>: REV4</tspan></text>
272 <path
273 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"
274 d="M 530.28921,343.6373 L 530.28921,319.47655"
275 id="path2824"
276 inkscape:connector-type="polyline" />
277 <rect
278 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"
279 id="rect2826"
280 width="94.285713"
281 height="20.714285"
282 x="436.57492"
283 y="250.47656" />
284 <text
285 xml:space="preserve"
286 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"
287 x="461.24484"
288 y="264.56613"
289 id="text2828"
290 transform="scale(1.000002,0.999998)"><tspan
291 sodipodi:role="line"
292 id="tspan2830"
293 x="461.24484"
294 y="264.56613"
295 style="font-family:Courier"><tspan
296 style="font-weight:bold"
297 id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text>
298 <path
299 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"
300 d="M 519.10362,296.76227 L 494.90337,272.19084"
301 id="path2834"
302 inkscape:connector-type="polyline" />
303 <rect
304 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"
305 id="rect2836"
306 width="94.285995"
307 height="20.714283"
308 x="483.14001"
309 y="156.548" />
310 <text
311 xml:space="preserve"
312 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"
313 x="555.95911"
314 y="218.02698"
315 id="text2838"
316 transform="scale(1.000002,0.999998)"><tspan
317 sodipodi:role="line"
318 id="tspan2840"
319 x="555.95911"
320 y="218.02698"
321 style="font-family:Courier"><tspan
322 id="tspan2842"
323 style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text>
324 <path
325 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"
326 d="M 536.21543,296.76227 L 574.03453,224.76218"
327 id="path2844"
328 inkscape:connector-type="polyline" />
329 <text
330 xml:space="preserve"
331 style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
332 x="452.00058"
333 y="167.76765"
334 id="text2846"
335 sodipodi:linespacing="125%"><tspan
336 sodipodi:role="line"
337 id="tspan2443"
338 x="452.00058"
339 y="167.76765">punta</tspan></text>
340 <path
341 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"
342 d="M 489.37034,249.47656 L 524.65575,178.26229"
343 id="path2856"
344 inkscape:connector-type="polyline"
345 inkscape:connection-end="#rect2836" />
346 <path
347 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"
348 d="M 567.85714,202.0479 L 542.42591,178.26229"
349 id="path2858"
350 inkscape:connector-type="polyline"
351 inkscape:connection-end="#rect2836"
352 inkscape:connection-start="#rect2995" />
353 <text
354 xml:space="preserve"
355 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"
356 x="490.40295"
357 y="170.39714"
358 id="text2860"><tspan
359 sodipodi:role="line"
360 id="tspan2863"
361 x="490.40295"
362 y="170.39714"
363 style="font-family:Courier"><tspan
364 style="font-weight:bold"
365 id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text>
366 <text
367 xml:space="preserve"
368 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"
369 x="90.323105"
370 y="120.21933"
371 id="text2929"><tspan
372 sodipodi:role="line"
373 id="tspan2931"
374 x="90.323105"
375 y="120.21933"
376 style="font-weight:bold">Directorio de trabajo durante la fusión</tspan></text>
377 <text
378 xml:space="preserve"
379 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"
380 x="435.35226"
381 y="120.21933"
382 id="text2937"><tspan
383 sodipodi:role="line"
384 id="tspan2939"
385 x="435.35226"
386 y="120.21933"
387 style="font-weight:bold">Repositorio después de consignar la fusión</tspan></text>
388 </g>
389 </svg>