Mercurial > evolve

comparison tests/test-topic-tutorial.t @ 2959:ef361938dfa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: integrate graphviz graphs in tutorials Use the mercurial-docgraph extension (https://pypi.python.org/pypi/hg- docgraph/) in tutorials in order to have some dot graphs in the tutorials .t files. Then generate the doc as usual, the sphinx-graphviz extension (http://www .sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should handle the generation of the graphs. Please be aware that you need the dot binary installed in your system. Please refer to the extension documentation for more configuration.
author Boris Feld <boris.feld@octobus.net>
date Thu, 21 Sep 2017 10:45:27 +0200
parents 2ddc63d13af8
children e036aab3d0cb
comparison
equal deleted inserted replaced
2958:1cb715257130 2959:ef361938dfa1
43 $ cd client 43 $ cd client
44 $ cat >> .hg/hgrc << EOF 44 $ cat >> .hg/hgrc << EOF
45 > [ui] 45 > [ui]
46 > user= Tutorial User 46 > user= Tutorial User
47 > EOF 47 > EOF
48 #if docgraph-ext
49 $ . "$TESTDIR/testlib/docgraph_setup.sh" #rest-ignore
50 #endif
48 51
49 Topic branches are lightweight branches which disappear when changes are 52 Topic branches are lightweight branches which disappear when changes are
50 finalized (moved to the public phase). They can help users to organize and share 53 finalized (moved to the public phase). They can help users to organize and share
51 their unfinished work. 54 their unfinished work.
52 55
60 tag: tip 63 tag: tip
61 user: test 64 user: test
62 date: Thu Jan 01 00:00:00 1970 +0000 65 date: Thu Jan 01 00:00:00 1970 +0000
63 summary: Shopping list 66 summary: Shopping list
64 67
68 #if docgraph-ext
69 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
70 .. graphviz::
71
72 strict digraph {
73 graph [rankdir=LR,
74 splines=polyline
75 ];
76 node [label="\N"];
77 0 [fillcolor="#7F7FFF",
78 fixedsize=true,
79 group=default,
80 height=2,
81 label="0: 38da43f0a2ea",
82 pin=true,
83 pos="1,0!",
84 shape=circle,
85 style=filled,
86 width=2];
87 }
88 #endif
65 89
66 We are about to make some additions to this list and would like to do them 90 We are about to make some additions to this list and would like to do them
67 within a topic. Creating a new topic is done using the ``topic`` command: 91 within a topic. Creating a new topic is done using the ``topic`` command:
68 92
69 $ hg topic food 93 $ hg topic food
88 user: test 112 user: test
89 date: Thu Jan 01 00:00:00 1970 +0000 113 date: Thu Jan 01 00:00:00 1970 +0000
90 summary: Shopping list 114 summary: Shopping list
91 115
92 116
117 #if docgraph-ext
118 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
119 .. graphviz::
120
121 strict digraph {
122 graph [rankdir=LR,
123 splines=polyline
124 ];
125 node [label="\N"];
126 0 [fillcolor="#7F7FFF",
127 fixedsize=true,
128 group=default,
129 height=2,
130 label="0: 38da43f0a2ea",
131 pin=true,
132 pos="1,0!",
133 shape=circle,
134 style=filled,
135 width=2];
136 }
137 #endif
138
93 Our next commit will be part of the active topic: 139 Our next commit will be part of the active topic:
94 140
95 $ cat >> shopping << EOF 141 $ cat >> shopping << EOF
96 > Egg 142 > Egg
97 > Suggar 143 > Suggar
108 user: test 154 user: test
109 date: Thu Jan 01 00:00:00 1970 +0000 155 date: Thu Jan 01 00:00:00 1970 +0000
110 summary: adding condiments 156 summary: adding condiments
111 157
112 158
159 #if docgraph-ext
160 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore
161 .. graphviz::
162
163 strict digraph {
164 graph [rankdir=LR,
165 splines=polyline
166 ];
167 node [label="\N"];
168 1 [fillcolor="#7F7FFF",
169 fixedsize=true,
170 group=default,
171 height=2,
172 label="1: 13900241408b",
173 pin=true,
174 pos="1,1!",
175 shape=pentagon,
176 style=filled,
177 width=2];
178 }
179 #endif
180
113 And future commits will be part of that topic too: 181 And future commits will be part of that topic too:
114 182
115 $ cat >> shopping << EOF 183 $ cat >> shopping << EOF
116 > Bananas 184 > Bananas
117 > Pear 185 > Pear
132 | topic: food 200 | topic: food
133 ~ user: test 201 ~ user: test
134 date: Thu Jan 01 00:00:00 1970 +0000 202 date: Thu Jan 01 00:00:00 1970 +0000
135 summary: adding condiments 203 summary: adding condiments
136 204
205
206 #if docgraph-ext
207 $ hg docgraph -r "topic("food")" --sphinx-directive --rankdir LR #rest-ignore
208 .. graphviz::
209
210 strict digraph {
211 graph [rankdir=LR,
212 splines=polyline
213 ];
214 node [label="\N"];
215 1 [fillcolor="#7F7FFF",
216 fixedsize=true,
217 group=default,
218 height=2,
219 label="1: 13900241408b",
220 pin=true,
221 pos="1,1!",
222 shape=pentagon,
223 style=filled,
224 width=2];
225 2 [fillcolor="#7F7FFF",
226 fixedsize=true,
227 group=default,
228 height=2,
229 label="2: 287de11b401f",
230 pin=true,
231 pos="1,2!",
232 shape=pentagon,
233 style=filled,
234 width=2];
235 1 -> 2;
236 }
237 #endif
137 238
138 We can get a compact view of the content of our topic using the ``stack`` 239 We can get a compact view of the content of our topic using the ``stack``
139 command: 240 command:
140 241
141 $ hg stack 242 $ hg stack
173 @ changeset: 0:38da43f0a2ea 274 @ changeset: 0:38da43f0a2ea
174 user: test 275 user: test
175 date: Thu Jan 01 00:00:00 1970 +0000 276 date: Thu Jan 01 00:00:00 1970 +0000
176 summary: Shopping list 277 summary: Shopping list
177 278
279
280 #if docgraph-ext
281 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
282 .. graphviz::
283
284 strict digraph {
285 graph [rankdir=LR,
286 splines=polyline
287 ];
288 node [label="\N"];
289 0 [fillcolor="#7F7FFF",
290 fixedsize=true,
291 group=default,
292 height=2,
293 label="0: 38da43f0a2ea",
294 pin=true,
295 pos="1,0!",
296 shape=circle,
297 style=filled,
298 width=2];
299 1 [fillcolor="#7F7FFF",
300 fixedsize=true,
301 group=default,
302 height=2,
303 label="1: 13900241408b",
304 pin=true,
305 pos="1,1!",
306 shape=pentagon,
307 style=filled,
308 width=2];
309 0 -> 1;
310 2 [fillcolor="#7F7FFF",
311 fixedsize=true,
312 group=default,
313 height=2,
314 label="2: 287de11b401f",
315 pin=true,
316 pos="1,2!",
317 shape=pentagon,
318 style=filled,
319 width=2];
320 1 -> 2;
321 }
322 #endif
178 And updating back to the topic reactivates it: 323 And updating back to the topic reactivates it:
179 324
180 $ hg update food 325 $ hg update food
181 switching to topic food 326 switching to topic food
182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 327 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
251 o changeset: 0:38da43f0a2ea 396 o changeset: 0:38da43f0a2ea
252 user: test 397 user: test
253 date: Thu Jan 01 00:00:00 1970 +0000 398 date: Thu Jan 01 00:00:00 1970 +0000
254 summary: Shopping list 399 summary: Shopping list
255 400
401 #if docgraph-ext
402 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
403 .. graphviz::
404
405 strict digraph {
406 graph [rankdir=LR,
407 splines=polyline
408 ];
409 node [label="\N"];
410 0 [fillcolor="#7F7FFF",
411 fixedsize=true,
412 group=default,
413 height=2,
414 label="0: 38da43f0a2ea",
415 pin=true,
416 pos="1,0!",
417 shape=circle,
418 style=filled,
419 width=2];
420 1 [fillcolor="#7F7FFF",
421 fixedsize=true,
422 group=default,
423 height=2,
424 label="1: 13900241408b",
425 pin=true,
426 pos="1,1!",
427 shape=pentagon,
428 style=filled,
429 width=2];
430 0 -> 1;
431 3 [fillcolor="#7F7FFF",
432 fixedsize=true,
433 group=default,
434 height=2,
435 label="3: 6104862e8b84",
436 pin=true,
437 pos="1,3!",
438 shape=circle,
439 style=filled,
440 width=2];
441 0 -> 3;
442 2 [fillcolor="#7F7FFF",
443 fixedsize=true,
444 group=default,
445 height=2,
446 label="2: 287de11b401f",
447 pin=true,
448 pos="1,2!",
449 shape=pentagon,
450 style=filled,
451 width=2];
452 1 -> 2;
453 }
454 #endif
256 455
257 The topic head will not be considered when merging from the new head of the 456 The topic head will not be considered when merging from the new head of the
258 branch: 457 branch:
259 458
260 $ hg update default 459 $ hg update default
301 o changeset: 0:38da43f0a2ea 500 o changeset: 0:38da43f0a2ea
302 user: test 501 user: test
303 date: Thu Jan 01 00:00:00 1970 +0000 502 date: Thu Jan 01 00:00:00 1970 +0000
304 summary: Shopping list 503 summary: Shopping list
305 504
505 #if docgraph-ext
506 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
507 .. graphviz::
508
509 strict digraph {
510 graph [rankdir=LR,
511 splines=polyline
512 ];
513 node [label="\N"];
514 0 [fillcolor="#7F7FFF",
515 fixedsize=true,
516 group=default,
517 height=2,
518 label="0: 38da43f0a2ea",
519 pin=true,
520 pos="1,0!",
521 shape=circle,
522 style=filled,
523 width=2];
524 3 [fillcolor="#7F7FFF",
525 fixedsize=true,
526 group=default,
527 height=2,
528 label="3: 6104862e8b84",
529 pin=true,
530 pos="1,3!",
531 shape=circle,
532 style=filled,
533 width=2];
534 0 -> 3;
535 4 [fillcolor="#7F7FFF",
536 fixedsize=true,
537 group=default,
538 height=2,
539 label="4: 4011b46eeb33",
540 pin=true,
541 pos="1,4!",
542 shape=pentagon,
543 style=filled,
544 width=2];
545 3 -> 4;
546 5 [fillcolor="#7F7FFF",
547 fixedsize=true,
548 group=default,
549 height=2,
550 label="5: 2d50db8b5b4c",
551 pin=true,
552 pos="1,5!",
553 shape=pentagon,
554 style=filled,
555 width=2];
556 4 -> 5;
557 }
558 #endif
306 559
307 The topic information will disappear when we publish the changesets: 560 The topic information will disappear when we publish the changesets:
308 561
309 $ hg topic 562 $ hg topic
310 * food 563 * food
342 o changeset: 0:38da43f0a2ea 595 o changeset: 0:38da43f0a2ea
343 user: test 596 user: test
344 date: Thu Jan 01 00:00:00 1970 +0000 597 date: Thu Jan 01 00:00:00 1970 +0000
345 summary: Shopping list 598 summary: Shopping list
346 599
600 #if docgraph-ext
601 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
602 .. graphviz::
603
604 strict digraph {
605 graph [rankdir=LR,
606 splines=polyline
607 ];
608 node [label="\N"];
609 0 [fillcolor="#7F7FFF",
610 fixedsize=true,
611 group=default,
612 height=2,
613 label="0: 38da43f0a2ea",
614 pin=true,
615 pos="1,0!",
616 shape=circle,
617 style=filled,
618 width=2];
619 3 [fillcolor="#7F7FFF",
620 fixedsize=true,
621 group=default,
622 height=2,
623 label="3: 6104862e8b84",
624 pin=true,
625 pos="1,3!",
626 shape=circle,
627 style=filled,
628 width=2];
629 0 -> 3;
630 4 [fillcolor="#7F7FFF",
631 fixedsize=true,
632 group=default,
633 height=2,
634 label="4: 4011b46eeb33",
635 pin=true,
636 pos="1,4!",
637 shape=circle,
638 style=filled,
639 width=2];
640 3 -> 4;
641 5 [fillcolor="#7F7FFF",
642 fixedsize=true,
643 group=default,
644 height=2,
645 label="5: 2d50db8b5b4c",
646 pin=true,
647 pos="1,5!",
648 shape=circle,
649 style=filled,
650 width=2];
651 4 -> 5;
652 }
653 #endif
654
347 $ hg update default 655 $ hg update default
348 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 656 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
349 657
350 Working with Multiple Topics 658 Working with Multiple Topics
351 ============================ 659 ============================
508 o changeset: 0:38da43f0a2ea 816 o changeset: 0:38da43f0a2ea
509 user: test 817 user: test
510 date: Thu Jan 01 00:00:00 1970 +0000 818 date: Thu Jan 01 00:00:00 1970 +0000
511 summary: Shopping list 819 summary: Shopping list
512 820
821 #if docgraph-ext
822 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
823 .. graphviz::
824
825 strict digraph {
826 graph [rankdir=LR,
827 splines=polyline
828 ];
829 node [label="\N"];
830 0 [fillcolor="#7F7FFF",
831 fixedsize=true,
832 group=default,
833 height=2,
834 label="0: 38da43f0a2ea",
835 pin=true,
836 pos="1,0!",
837 shape=circle,
838 style=filled,
839 width=2];
840 3 [fillcolor="#7F7FFF",
841 fixedsize=true,
842 group=default,
843 height=2,
844 label="3: 6104862e8b84",
845 pin=true,
846 pos="1,3!",
847 shape=circle,
848 style=filled,
849 width=2];
850 0 -> 3;
851 4 [fillcolor="#7F7FFF",
852 fixedsize=true,
853 group=default,
854 height=2,
855 label="4: 4011b46eeb33",
856 pin=true,
857 pos="1,4!",
858 shape=circle,
859 style=filled,
860 width=2];
861 3 -> 4;
862 5 [fillcolor="#7F7FFF",
863 fixedsize=true,
864 group=default,
865 height=2,
866 label="5: 2d50db8b5b4c",
867 pin=true,
868 pos="1,5!",
869 shape=circle,
870 style=filled,
871 width=2];
872 4 -> 5;
873 6 [fillcolor="#7F7FFF",
874 fixedsize=true,
875 group=default,
876 height=2,
877 label="6: 183984ef46d1",
878 pin=true,
879 pos="1,6!",
880 shape=pentagon,
881 style=filled,
882 width=2];
883 5 -> 6;
884 9 [fillcolor="#7F7FFF",
885 fixedsize=true,
886 group=default,
887 height=2,
888 label="9: 8dfa45bd5e0c",
889 pin=true,
890 pos="1,9!",
891 shape=pentagon,
892 style=filled,
893 width=2];
894 5 -> 9;
895 11 [fillcolor="#7F7FFF",
896 fixedsize=true,
897 group=default,
898 height=2,
899 label="11: f2d6cacc6115",
900 pin=true,
901 pos="1,11!",
902 shape=circle,
903 style=filled,
904 width=2];
905 5 -> 11;
906 7 [fillcolor="#7F7FFF",
907 fixedsize=true,
908 group=default,
909 height=2,
910 label="7: cffff85af537",
911 pin=true,
912 pos="1,7!",
913 shape=pentagon,
914 style=filled,
915 width=2];
916 6 -> 7;
917 8 [fillcolor="#7F7FFF",
918 fixedsize=true,
919 group=default,
920 height=2,
921 label="8: 34255b455dac",
922 pin=true,
923 pos="1,8!",
924 shape=pentagon,
925 style=filled,
926 width=2];
927 7 -> 8;
928 10 [fillcolor="#7F7FFF",
929 fixedsize=true,
930 group=default,
931 height=2,
932 label="10: 70dfa201ed73",
933 pin=true,
934 pos="1,10!",
935 shape=pentagon,
936 style=filled,
937 width=2];
938 9 -> 10;
939 12 [fillcolor="#7F7FFF",
940 fixedsize=true,
941 group=default,
942 height=2,
943 label="12: fbff9bc37a43",
944 pin=true,
945 pos="1,12!",
946 shape=circle,
947 style=filled,
948 width=2];
949 11 -> 12;
950 }
951 #endif
952
513 $ hg rebase 953 $ hg rebase
514 rebasing 6:183984ef46d1 "Adding hammer" 954 rebasing 6:183984ef46d1 "Adding hammer"
515 merging shopping 955 merging shopping
516 switching to topic tools 956 switching to topic tools
517 rebasing 7:cffff85af537 "Adding saw" 957 rebasing 7:cffff85af537 "Adding saw"
706 o changeset: 12:fbff9bc37a43 1146 o changeset: 12:fbff9bc37a43
707 | user: test 1147 | user: test
708 ~ date: Thu Jan 01 00:00:00 1970 +0000 1148 ~ date: Thu Jan 01 00:00:00 1970 +0000
709 summary: add a pair of shoes 1149 summary: add a pair of shoes
710 1150
1151
1152 #if docgraph-ext
1153 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1154 .. graphviz::
1155
1156 strict digraph {
1157 graph [rankdir=LR,
1158 splines=polyline
1159 ];
1160 node [label="\N"];
1161 12 [fillcolor="#7F7FFF",
1162 fixedsize=true,
1163 group=default,
1164 height=2,
1165 label="12: fbff9bc37a43",
1166 pin=true,
1167 pos="1,12!",
1168 shape=circle,
1169 style=filled,
1170 width=2];
1171 13 [fillcolor="#DFDFFF",
1172 fixedsize=true,
1173 group=default_alt,
1174 height=2,
1175 label="13: a8ab3599d53d",
1176 pin=true,
1177 pos="2,13!",
1178 shape=pentagon,
1179 style="dotted, filled",
1180 width=2];
1181 12 -> 13;
1182 18 [fillcolor="#7F7FFF",
1183 fixedsize=true,
1184 group=default,
1185 height=2,
1186 label="18: b7509bd417f8",
1187 pin=true,
1188 pos="1,18!",
1189 shape=pentagon,
1190 style=filled,
1191 width=2];
1192 12 -> 18;
1193 16 [fillcolor="#7F7FFF",
1194 fixedsize=true,
1195 group=default,
1196 height=2,
1197 label="16: 20759cb47ff8",
1198 pin=true,
1199 pos="1,16!",
1200 shape=circle,
1201 style=filled,
1202 width=2];
1203 12 -> 16;
1204 13 -> 18 [arrowtail=dot,
1205 dir=back,
1206 minlen=0,
1207 style=dotted];
1208 14 [fillcolor="#FF3535",
1209 fixedsize=true,
1210 group=default_alt,
1211 height=2,
1212 label="14: d4f97f32f8a1",
1213 pin=true,
1214 pos="2,14!",
1215 shape=pentagon,
1216 style=filled,
1217 width=2];
1218 13 -> 14;
1219 15 [fillcolor="#FF3535",
1220 fixedsize=true,
1221 group=default_alt,
1222 height=2,
1223 label="15: bb1e6254f532",
1224 pin=true,
1225 pos="2,15!",
1226 shape=pentagon,
1227 style=filled,
1228 width=2];
1229 14 -> 15;
1230 17 [fillcolor="#7F7FFF",
1231 fixedsize=true,
1232 group=default,
1233 height=2,
1234 label="17: 4cd7c1591a67",
1235 pin=true,
1236 pos="1,17!",
1237 shape=circle,
1238 style=filled,
1239 width=2];
1240 16 -> 17;
1241 }
1242 #endif
1243
711 Fortunately stack shows you a better visualization: 1244 Fortunately stack shows you a better visualization:
712 1245
713 $ hg stack 1246 $ hg stack
714 ### topic: tools 1247 ### topic: tools
715 ### branch: default, 2 behind 1248 ### branch: default, 2 behind
785 o changeset: 12:fbff9bc37a43 1318 o changeset: 12:fbff9bc37a43
786 | user: test 1319 | user: test
787 ~ date: Thu Jan 01 00:00:00 1970 +0000 1320 ~ date: Thu Jan 01 00:00:00 1970 +0000
788 summary: add a pair of shoes 1321 summary: add a pair of shoes
789 1322
1323
1324 #if docgraph-ext
1325 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore
1326 .. graphviz::
1327
1328 strict digraph {
1329 graph [rankdir=LR,
1330 splines=polyline
1331 ];
1332 node [label="\N"];
1333 12 [fillcolor="#7F7FFF",
1334 fixedsize=true,
1335 group=default,
1336 height=2,
1337 label="12: fbff9bc37a43",
1338 pin=true,
1339 pos="1,12!",
1340 shape=circle,
1341 style=filled,
1342 width=2];
1343 16 [fillcolor="#7F7FFF",
1344 fixedsize=true,
1345 group=default,
1346 height=2,
1347 label="16: 20759cb47ff8",
1348 pin=true,
1349 pos="1,16!",
1350 shape=circle,
1351 style=filled,
1352 width=2];
1353 12 -> 16;
1354 18 [fillcolor="#7F7FFF",
1355 fixedsize=true,
1356 group=default,
1357 height=2,
1358 label="18: b7509bd417f8",
1359 pin=true,
1360 pos="1,18!",
1361 shape=pentagon,
1362 style=filled,
1363 width=2];
1364 12 -> 18;
1365 17 [fillcolor="#7F7FFF",
1366 fixedsize=true,
1367 group=default,
1368 height=2,
1369 label="17: 4cd7c1591a67",
1370 pin=true,
1371 pos="1,17!",
1372 shape=circle,
1373 style=filled,
1374 width=2];
1375 16 -> 17;
1376 19 [fillcolor="#7F7FFF",
1377 fixedsize=true,
1378 group=default,
1379 height=2,
1380 label="19: d5c51ee5762a",
1381 pin=true,
1382 pos="1,19!",
1383 shape=pentagon,
1384 style=filled,
1385 width=2];
1386 18 -> 19;
1387 20 [fillcolor="#7F7FFF",
1388 fixedsize=true,
1389 group=default,
1390 height=2,
1391 label="20: bae3758e46bf",
1392 pin=true,
1393 pos="1,20!",
1394 shape=pentagon,
1395 style=filled,
1396 width=2];
1397 19 -> 20;
1398 }
1399 #endif
790 Multi-headed stack 1400 Multi-headed stack
791 ------------------ 1401 ------------------
792 1402
793 Stack is also very helpful when you have a multi-headed stack: 1403 Stack is also very helpful when you have a multi-headed stack:
794 1404
885 user: test 1495 user: test
886 date: Thu Jan 01 00:00:00 1970 +0000 1496 date: Thu Jan 01 00:00:00 1970 +0000
887 summary: Shopping list 1497 summary: Shopping list
888 1498
889 1499
1500 #if docgraph-ext
1501 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore
1502 .. graphviz::
1503
1504 strict digraph {
1505 graph [rankdir=LR,
1506 splines=polyline
1507 ];
1508 node [label="\N"];
1509 0 [fillcolor="#7F7FFF",
1510 fixedsize=true,
1511 group=default,
1512 height=2,
1513 label="0: 38da43f0a2ea",
1514 pin=true,
1515 pos="1,0!",
1516 shape=circle,
1517 style=filled,
1518 width=2];
1519 3 [fillcolor="#7F7FFF",
1520 fixedsize=true,
1521 group=default,
1522 height=2,
1523 label="3: 6104862e8b84",
1524 pin=true,
1525 pos="1,3!",
1526 shape=circle,
1527 style=filled,
1528 width=2];
1529 0 -> 3;
1530 4 [fillcolor="#7F7FFF",
1531 fixedsize=true,
1532 group=default,
1533 height=2,
1534 label="4: 4011b46eeb33",
1535 pin=true,
1536 pos="1,4!",
1537 shape=circle,
1538 style=filled,
1539 width=2];
1540 3 -> 4;
1541 5 [fillcolor="#7F7FFF",
1542 fixedsize=true,
1543 group=default,
1544 height=2,
1545 label="5: 2d50db8b5b4c",
1546 pin=true,
1547 pos="1,5!",
1548 shape=circle,
1549 style=filled,
1550 width=2];
1551 4 -> 5;
1552 11 [fillcolor="#7F7FFF",
1553 fixedsize=true,
1554 group=default,
1555 height=2,
1556 label="11: f2d6cacc6115",
1557 pin=true,
1558 pos="1,11!",
1559 shape=circle,
1560 style=filled,
1561 width=2];
1562 5 -> 11;
1563 12 [fillcolor="#7F7FFF",
1564 fixedsize=true,
1565 group=default,
1566 height=2,
1567 label="12: fbff9bc37a43",
1568 pin=true,
1569 pos="1,12!",
1570 shape=circle,
1571 style=filled,
1572 width=2];
1573 11 -> 12;
1574 16 [fillcolor="#7F7FFF",
1575 fixedsize=true,
1576 group=default,
1577 height=2,
1578 label="16: 20759cb47ff8",
1579 pin=true,
1580 pos="1,16!",
1581 shape=circle,
1582 style=filled,
1583 width=2];
1584 12 -> 16;
1585 18 [fillcolor="#7F7FFF",
1586 fixedsize=true,
1587 group=default,
1588 height=2,
1589 label="18: b7509bd417f8",
1590 pin=true,
1591 pos="1,18!",
1592 shape=pentagon,
1593 style=filled,
1594 width=2];
1595 12 -> 18;
1596 17 [fillcolor="#7F7FFF",
1597 fixedsize=true,
1598 group=default,
1599 height=2,
1600 label="17: 4cd7c1591a67",
1601 pin=true,
1602 pos="1,17!",
1603 shape=circle,
1604 style=filled,
1605 width=2];
1606 16 -> 17;
1607 19 [fillcolor="#7F7FFF",
1608 fixedsize=true,
1609 group=default,
1610 height=2,
1611 label="19: d5c51ee5762a",
1612 pin=true,
1613 pos="1,19!",
1614 shape=pentagon,
1615 style=filled,
1616 width=2];
1617 18 -> 19;
1618 21 [fillcolor="#7F7FFF",
1619 fixedsize=true,
1620 group=default,
1621 height=2,
1622 label="21: f936c6da9d61",
1623 pin=true,
1624 pos="1,21!",
1625 shape=pentagon,
1626 style=filled,
1627 width=2];
1628 18 -> 21;
1629 20 [fillcolor="#7F7FFF",
1630 fixedsize=true,
1631 group=default,
1632 height=2,
1633 label="20: bae3758e46bf",
1634 pin=true,
1635 pos="1,20!",
1636 shape=pentagon,
1637 style=filled,
1638 width=2];
1639 19 -> 20;
1640 }
1641 #endif
1642
890 $ hg up t4 1643 $ hg up t4
891 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1644 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
892 1645
893 $ hg rebase 1646 $ hg rebase
894 rebasing 19:d5c51ee5762a "Adding saw" 1647 rebasing 19:d5c51ee5762a "Adding saw"