Mercurial > hgbook
comparison en/tour-merge-merge.svg @ 100:272146fab009
Add yet another illustration of the merge process.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 18 Oct 2006 12:06:56 -0700 |
parents | en/tour-merge-pull.svg@06383f9e46e4 |
children | 321732566ac1 |
comparison
equal
deleted
inserted
replaced
99:06383f9e46e4 | 100:272146fab009 |
---|---|
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: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.44.1" | |
16 sodipodi:docname="tour-merge-merge.svg" | |
17 sodipodi:docbase="/home/bos/hg/hgbook/en"> | |
18 <defs | |
19 id="defs4"> | |
20 <marker | |
21 inkscape:stockid="Arrow1Mstart" | |
22 orient="auto" | |
23 refY="0.0" | |
24 refX="0.0" | |
25 id="Arrow1Mstart" | |
26 style="overflow:visible"> | |
27 <path | |
28 id="path2973" | |
29 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
30 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" | |
31 transform="scale(0.4) translate(10,0)" /> | |
32 </marker> | |
33 <marker | |
34 inkscape:stockid="Arrow1Mend" | |
35 orient="auto" | |
36 refY="0.0" | |
37 refX="0.0" | |
38 id="Arrow1Mend" | |
39 style="overflow:visible;"> | |
40 <path | |
41 id="path3066" | |
42 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " | |
43 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" | |
44 transform="scale(0.4) rotate(180) translate(10,0)" /> | |
45 </marker> | |
46 </defs> | |
47 <sodipodi:namedview | |
48 id="base" | |
49 pagecolor="#ffffff" | |
50 bordercolor="#666666" | |
51 borderopacity="1.0" | |
52 gridtolerance="10000" | |
53 guidetolerance="10" | |
54 objecttolerance="10" | |
55 inkscape:pageopacity="0.0" | |
56 inkscape:pageshadow="2" | |
57 inkscape:zoom="1.4" | |
58 inkscape:cx="247.53795" | |
59 inkscape:cy="871.05738" | |
60 inkscape:document-units="px" | |
61 inkscape:current-layer="layer1" | |
62 inkscape:window-width="906" | |
63 inkscape:window-height="620" | |
64 inkscape:window-x="38" | |
65 inkscape:window-y="95" /> | |
66 <metadata | |
67 id="metadata7"> | |
68 <rdf:RDF> | |
69 <cc:Work | |
70 rdf:about=""> | |
71 <dc:format>image/svg+xml</dc:format> | |
72 <dc:type | |
73 rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | |
74 </cc:Work> | |
75 </rdf:RDF> | |
76 </metadata> | |
77 <g | |
78 inkscape:label="Layer 1" | |
79 inkscape:groupmode="layer" | |
80 id="layer1"> | |
81 <rect | |
82 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" | |
83 id="rect2995" | |
84 width="94.285713" | |
85 height="20.714285" | |
86 x="532.85718" | |
87 y="203.0479" /> | |
88 <text | |
89 xml:space="preserve" | |
90 style="font-size:12px;font-style:normal;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" | |
91 x="173.57143" | |
92 y="443.79074" | |
93 id="text2832"><tspan | |
94 sodipodi:role="line" | |
95 id="tspan2834" | |
96 x="173.57143" | |
97 y="443.79074" /></text> | |
98 <rect | |
99 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" | |
100 id="rect2830" | |
101 width="94.285713" | |
102 height="20.714285" | |
103 x="138" | |
104 y="297.76227" /> | |
105 <text | |
106 xml:space="preserve" | |
107 style="font-size:12px;font-style:normal;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" | |
108 x="162.09892" | |
109 y="311.38342" | |
110 id="text2824"><tspan | |
111 sodipodi:role="line" | |
112 id="tspan2826" | |
113 x="162.09892" | |
114 y="311.38342" | |
115 style="font-family:Courier"><tspan | |
116 style="font-weight:bold" | |
117 id="tspan2862">4</tspan>: b57f</tspan></text> | |
118 <path | |
119 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" | |
120 d="M 185.14286,343.63731 L 185.14286,319.47656" | |
121 id="path2900" | |
122 inkscape:connector-type="polyline" /> | |
123 <rect | |
124 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" | |
125 id="rect2863" | |
126 width="94.285713" | |
127 height="20.714285" | |
128 x="91.428574" | |
129 y="250.47656" /> | |
130 <text | |
131 xml:space="preserve" | |
132 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" | |
133 x="116.09886" | |
134 y="264.56592" | |
135 id="text1965" | |
136 transform="scale(1.000002,0.999998)"><tspan | |
137 sodipodi:role="line" | |
138 id="tspan1967" | |
139 x="116.09886" | |
140 y="264.56592" | |
141 style="font-family:Courier"><tspan | |
142 style="font-weight:bold" | |
143 id="tspan1973">5</tspan>: ae13</tspan></text> | |
144 <path | |
145 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" | |
146 d="M 173.95727,296.76228 L 149.75702,272.19085" | |
147 id="path1971" | |
148 inkscape:connector-type="polyline" | |
149 inkscape:connection-end="#rect2863" | |
150 inkscape:connection-start="#rect2830" /> | |
151 <rect | |
152 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" | |
153 id="rect2911" | |
154 width="94.285995" | |
155 height="20.714283" | |
156 x="186.71414" | |
157 y="204.40514" /> | |
158 <text | |
159 xml:space="preserve" | |
160 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" | |
161 x="210.81311" | |
162 y="218.02673" | |
163 id="text2913" | |
164 transform="scale(1.000002,0.999998)"><tspan | |
165 sodipodi:role="line" | |
166 id="tspan2915" | |
167 x="210.81311" | |
168 y="218.02673" | |
169 style="font-family:Courier"><tspan | |
170 id="tspan1966" | |
171 style="font-weight:bold">6</tspan>: d2b5</tspan></text> | |
172 <path | |
173 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" | |
174 d="M 191.06908,296.76228 L 227.93092,226.11942" | |
175 id="path2919" | |
176 inkscape:connector-type="polyline" | |
177 inkscape:connection-start="#rect2830" /> | |
178 <text | |
179 xml:space="preserve" | |
180 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
181 x="295.28571" | |
182 y="217.56711" | |
183 id="text2871"><tspan | |
184 sodipodi:role="line" | |
185 id="tspan2873" | |
186 x="295.28571" | |
187 y="217.56711">tip (and head)</tspan></text> | |
188 <text | |
189 xml:space="preserve" | |
190 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
191 x="76" | |
192 y="264.91769" | |
193 id="text2875"><tspan | |
194 sodipodi:role="line" | |
195 id="tspan2877" | |
196 x="76" | |
197 y="264.91769" | |
198 style="text-align:end;text-anchor:end">head</tspan></text> | |
199 <rect | |
200 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" | |
201 id="rect1913" | |
202 width="94.285713" | |
203 height="20.714285" | |
204 x="138" | |
205 y="156.90514" /> | |
206 <path | |
207 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" | |
208 d="M 144.22399,249.47657 L 179.49029,178.61943" | |
209 id="path1915" | |
210 inkscape:connector-type="polyline" | |
211 inkscape:connection-start="#rect2863" | |
212 inkscape:connection-end="#rect1913" /> | |
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 222.20966,203.40514 L 196.79033,178.61943" | |
216 id="path1917" | |
217 inkscape:connector-type="polyline" | |
218 inkscape:connection-start="#rect2911" | |
219 inkscape:connection-end="#rect1913" /> | |
220 <text | |
221 xml:space="preserve" | |
222 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
223 x="166.16823" | |
224 y="168.52228" | |
225 id="text2806"><tspan | |
226 sodipodi:role="line" | |
227 id="tspan2808" | |
228 x="166.16823" | |
229 y="168.52228" | |
230 style="font-family:Courier">merge</tspan></text> | |
231 <text | |
232 xml:space="preserve" | |
233 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
234 x="246" | |
235 y="162.63338" | |
236 id="text2810"><tspan | |
237 sodipodi:role="line" | |
238 id="tspan2812" | |
239 x="246" | |
240 y="162.63338">working directory</tspan><tspan | |
241 sodipodi:role="line" | |
242 x="246" | |
243 y="177.63338" | |
244 id="tspan2814">during merge</tspan></text> | |
245 <rect | |
246 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" | |
247 id="rect2816" | |
248 width="94.285713" | |
249 height="20.714285" | |
250 x="483.14636" | |
251 y="297.76227" /> | |
252 <text | |
253 xml:space="preserve" | |
254 style="font-size:12px;font-style:normal;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" | |
255 x="507.24527" | |
256 y="311.38342" | |
257 id="text2818"><tspan | |
258 sodipodi:role="line" | |
259 id="tspan2820" | |
260 x="507.24527" | |
261 y="311.38342" | |
262 style="font-family:Courier"><tspan | |
263 style="font-weight:bold" | |
264 id="tspan2822">4</tspan>: b57f</tspan></text> | |
265 <path | |
266 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" | |
267 d="M 530.28921,343.6373 L 530.28921,319.47655" | |
268 id="path2824" | |
269 inkscape:connector-type="polyline" /> | |
270 <rect | |
271 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" | |
272 id="rect2826" | |
273 width="94.285713" | |
274 height="20.714285" | |
275 x="436.57492" | |
276 y="250.47656" /> | |
277 <text | |
278 xml:space="preserve" | |
279 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" | |
280 x="461.24484" | |
281 y="264.56613" | |
282 id="text2828" | |
283 transform="scale(1.000002,0.999998)"><tspan | |
284 sodipodi:role="line" | |
285 id="tspan2830" | |
286 x="461.24484" | |
287 y="264.56613" | |
288 style="font-family:Courier"><tspan | |
289 style="font-weight:bold" | |
290 id="tspan2832">5</tspan>: ae13</tspan></text> | |
291 <path | |
292 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" | |
293 d="M 519.10362,296.76227 L 494.90337,272.19084" | |
294 id="path2834" | |
295 inkscape:connector-type="polyline" /> | |
296 <rect | |
297 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" | |
298 id="rect2836" | |
299 width="94.285995" | |
300 height="20.714283" | |
301 x="483.14001" | |
302 y="156.548" /> | |
303 <text | |
304 xml:space="preserve" | |
305 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" | |
306 x="555.95911" | |
307 y="218.02698" | |
308 id="text2838" | |
309 transform="scale(1.000002,0.999998)"><tspan | |
310 sodipodi:role="line" | |
311 id="tspan2840" | |
312 x="555.95911" | |
313 y="218.02698" | |
314 style="font-family:Courier"><tspan | |
315 id="tspan2842" | |
316 style="font-weight:bold">6</tspan>: d2b5</tspan></text> | |
317 <path | |
318 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" | |
319 d="M 536.21543,296.76227 L 574.03453,224.76218" | |
320 id="path2844" | |
321 inkscape:connector-type="polyline" /> | |
322 <text | |
323 xml:space="preserve" | |
324 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
325 x="594.43207" | |
326 y="169.78796" | |
327 id="text2846"><tspan | |
328 sodipodi:role="line" | |
329 id="tspan2848" | |
330 x="594.43207" | |
331 y="169.78796">tip</tspan></text> | |
332 <path | |
333 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" | |
334 d="M 489.37034,249.47656 L 524.65575,178.26229" | |
335 id="path2856" | |
336 inkscape:connector-type="polyline" | |
337 inkscape:connection-end="#rect2836" /> | |
338 <path | |
339 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" | |
340 d="M 567.85714,202.0479 L 542.42591,178.26229" | |
341 id="path2858" | |
342 inkscape:connector-type="polyline" | |
343 inkscape:connection-end="#rect2836" | |
344 inkscape:connection-start="#rect2995" /> | |
345 <text | |
346 xml:space="preserve" | |
347 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
348 x="504.54507" | |
349 y="170.39714" | |
350 id="text2860"><tspan | |
351 sodipodi:role="line" | |
352 id="tspan2863" | |
353 x="504.54507" | |
354 y="170.39714" | |
355 style="font-family:Courier"><tspan | |
356 style="font-weight:bold" | |
357 id="tspan2997">7</tspan>: dba3</tspan></text> | |
358 <text | |
359 xml:space="preserve" | |
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" | |
361 x="90.323105" | |
362 y="120.21933" | |
363 id="text2929"><tspan | |
364 sodipodi:role="line" | |
365 id="tspan2931" | |
366 x="90.323105" | |
367 y="120.21933" | |
368 style="font-weight:bold">Working directory during merge</tspan></text> | |
369 <text | |
370 xml:space="preserve" | |
371 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" | |
372 x="435.35226" | |
373 y="120.21933" | |
374 id="text2937"><tspan | |
375 sodipodi:role="line" | |
376 id="tspan2939" | |
377 x="435.35226" | |
378 y="120.21933" | |
379 style="font-weight:bold">Repository after merge committed</tspan></text> | |
380 </g> | |
381 </svg> |