Mercurial > evolve

comparison tests/test-tutorial.t @ 2965:e036aab3d0cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: update graph with latest version of doc-graph
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 21 Sep 2017 17:44:58 +0200
parents ef361938dfa1
children bd7e8be29542
comparison
equal deleted inserted replaced
2964:9aec8fec2bf8 2965:e036aab3d0cb
136 strict digraph { 136 strict digraph {
137 graph [rankdir=LR, 137 graph [rankdir=LR,
138 splines=polyline 138 splines=polyline
139 ]; 139 ];
140 node [label="\N"]; 140 node [label="\N"];
141 0 [fillcolor="#7F7FFF", 141 0 [fillcolor="#9999FF",
142 fixedsize=true, 142 fixedsize=true,
143 group=default, 143 group=default,
144 height=2, 144 height=0.5,
145 label="0: 7e82d3f3c2cb", 145 label=0,
146 pin=true, 146 pin=true,
147 pos="1,0!", 147 pos="1,0!",
148 shape=circle, 148 shape=circle,
149 style=filled, 149 style=filled,
150 width=2]; 150 width=0.5];
151 1 [fillcolor="#7F7FFF", 151 1 [fillcolor="#9999FF",
152 fixedsize=true, 152 fixedsize=true,
153 group=default, 153 group=default,
154 height=2, 154 height=0.5,
155 label="1: 4d5dc8187023", 155 label=1,
156 pin=true, 156 pin=true,
157 pos="1,1!", 157 pos="1,1!",
158 shape=pentagon, 158 shape=pentagon,
159 style=filled, 159 style=filled,
160 width=2]; 160 width=0.5];
161 0 -> 1; 161 0 -> 1 [arrowhead=none,
162 2 [fillcolor="#7F7FFF", 162 penwidth=2.0];
163 fixedsize=true, 163 2 [fillcolor="#9999FF",
164 group=default, 164 fixedsize=true,
165 height=2, 165 group=default,
166 label="2: d85de4546133", 166 height=0.5,
167 label=2,
167 pin=true, 168 pin=true,
168 pos="1,2!", 169 pos="1,2!",
169 shape=pentagon, 170 shape=pentagon,
170 style=filled, 171 style=filled,
171 width=2]; 172 width=0.5];
172 1 -> 2; 173 1 -> 2 [arrowhead=none,
174 penwidth=2.0];
173 } 175 }
174 #endif 176 #endif
175 177
176 But a typo was made in Babanas! 178 But a typo was made in Babanas!
177 179
213 strict digraph { 215 strict digraph {
214 graph [rankdir=LR, 216 graph [rankdir=LR,
215 splines=polyline 217 splines=polyline
216 ]; 218 ];
217 node [label="\N"]; 219 node [label="\N"];
218 0 [fillcolor="#7F7FFF", 220 0 [fillcolor="#9999FF",
219 fixedsize=true, 221 fixedsize=true,
220 group=default, 222 group=default,
221 height=2, 223 height=0.5,
222 label="0: 7e82d3f3c2cb", 224 label=0,
223 pin=true, 225 pin=true,
224 pos="1,0!", 226 pos="1,0!",
225 shape=circle, 227 shape=circle,
226 style=filled, 228 style=filled,
227 width=2]; 229 width=0.5];
228 1 [fillcolor="#7F7FFF", 230 1 [fillcolor="#9999FF",
229 fixedsize=true, 231 fixedsize=true,
230 group=default, 232 group=default,
231 height=2, 233 height=0.5,
232 label="1: 4d5dc8187023", 234 label=1,
233 pin=true, 235 pin=true,
234 pos="1,1!", 236 pos="1,1!",
235 shape=pentagon, 237 shape=pentagon,
236 style=filled, 238 style=filled,
237 width=2]; 239 width=0.5];
238 0 -> 1; 240 0 -> 1 [arrowhead=none,
239 2 [fillcolor="#7F7FFF", 241 penwidth=2.0];
240 fixedsize=true, 242 2 [fillcolor="#9999FF",
241 group=default, 243 fixedsize=true,
242 height=2, 244 group=default,
243 label="2: d85de4546133", 245 height=0.5,
246 label=2,
244 pin=true, 247 pin=true,
245 pos="1,2!", 248 pos="1,2!",
246 shape=pentagon, 249 shape=pentagon,
247 style=filled, 250 style=filled,
248 width=2]; 251 width=0.5];
249 1 -> 2; 252 1 -> 2 [arrowhead=none,
253 penwidth=2.0];
250 } 254 }
251 #endif 255 #endif
252 256
253 Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset! 257 Hopefully. I can use `hg commit --amend` to rewrite my faulty changeset!
254 258
283 strict digraph { 287 strict digraph {
284 graph [rankdir=LR, 288 graph [rankdir=LR,
285 splines=polyline 289 splines=polyline
286 ]; 290 ];
287 node [label="\N"]; 291 node [label="\N"];
288 0 [fillcolor="#7F7FFF", 292 0 [fillcolor="#9999FF",
289 fixedsize=true, 293 fixedsize=true,
290 group=default, 294 group=default,
291 height=2, 295 height=0.5,
292 label="0: 7e82d3f3c2cb", 296 label=0,
293 pin=true, 297 pin=true,
294 pos="1,0!", 298 pos="1,0!",
295 shape=circle, 299 shape=circle,
296 style=filled, 300 style=filled,
297 width=2]; 301 width=0.5];
298 1 [fillcolor="#7F7FFF", 302 1 [fillcolor="#9999FF",
299 fixedsize=true, 303 fixedsize=true,
300 group=default, 304 group=default,
301 height=2, 305 height=0.5,
302 label="1: 4d5dc8187023", 306 label=1,
303 pin=true, 307 pin=true,
304 pos="1,1!", 308 pos="1,1!",
305 shape=pentagon, 309 shape=pentagon,
306 style=filled, 310 style=filled,
307 width=2]; 311 width=0.5];
308 0 -> 1; 312 0 -> 1 [arrowhead=none,
309 3 [fillcolor="#7F7FFF", 313 penwidth=2.0];
310 fixedsize=true, 314 3 [fillcolor="#9999FF",
311 group=default, 315 fixedsize=true,
312 height=2, 316 group=default,
313 label="3: 9d0363b81950", 317 height=0.5,
318 label=3,
314 pin=true, 319 pin=true,
315 pos="1,3!", 320 pos="1,3!",
316 shape=pentagon, 321 shape=pentagon,
317 style=filled, 322 style=filled,
318 width=2]; 323 width=0.5];
319 1 -> 3; 324 1 -> 3 [arrowhead=none,
325 penwidth=2.0];
320 } 326 }
321 #endif 327 #endif
322 328
323 $ hg export tip 329 $ hg export tip
324 # HG changeset patch 330 # HG changeset patch
381 strict digraph { 387 strict digraph {
382 graph [rankdir=LR, 388 graph [rankdir=LR,
383 splines=polyline 389 splines=polyline
384 ]; 390 ];
385 node [label="\N"]; 391 node [label="\N"];
386 0 [fillcolor="#7F7FFF", 392 0 [fillcolor="#9999FF",
387 fixedsize=true, 393 fixedsize=true,
388 group=default, 394 group=default,
389 height=2, 395 height=0.5,
390 label="0: 7e82d3f3c2cb", 396 label=0,
391 pin=true, 397 pin=true,
392 pos="1,0!", 398 pos="1,0!",
393 shape=circle, 399 shape=circle,
394 style=filled, 400 style=filled,
395 width=2]; 401 width=0.5];
396 1 [fillcolor="#7F7FFF", 402 1 [fillcolor="#9999FF",
397 fixedsize=true, 403 fixedsize=true,
398 group=default, 404 group=default,
399 height=2, 405 height=0.5,
400 label="1: 4d5dc8187023", 406 label=1,
401 pin=true, 407 pin=true,
402 pos="1,1!", 408 pos="1,1!",
403 shape=pentagon, 409 shape=pentagon,
404 style=filled, 410 style=filled,
405 width=2]; 411 width=0.5];
406 0 -> 1; 412 0 -> 1 [arrowhead=none,
407 4 [fillcolor="#7F7FFF", 413 penwidth=2.0];
408 fixedsize=true, 414 4 [fillcolor="#9999FF",
409 group=default, 415 fixedsize=true,
410 height=2, 416 group=default,
411 label="4: 9ca060c80d74", 417 height=0.5,
418 label=4,
412 pin=true, 419 pin=true,
413 pos="1,4!", 420 pos="1,4!",
414 shape=circle, 421 shape=circle,
415 style=filled, 422 style=filled,
416 width=2]; 423 width=0.5];
417 0 -> 4; 424 0 -> 4 [arrowhead=none,
418 3 [fillcolor="#7F7FFF", 425 penwidth=2.0];
419 fixedsize=true, 426 3 [fillcolor="#9999FF",
420 group=default, 427 fixedsize=true,
421 height=2, 428 group=default,
422 label="3: 9d0363b81950", 429 height=0.5,
430 label=3,
423 pin=true, 431 pin=true,
424 pos="1,3!", 432 pos="1,3!",
425 shape=pentagon, 433 shape=pentagon,
426 style=filled, 434 style=filled,
427 width=2]; 435 width=0.5];
428 1 -> 3; 436 1 -> 3 [arrowhead=none,
437 penwidth=2.0];
429 } 438 }
430 #endif 439 #endif
431 440
432 Instead of merging my head with the new one. I'm going to rebase my work 441 Instead of merging my head with the new one. I'm going to rebase my work
433 442
457 strict digraph { 466 strict digraph {
458 graph [rankdir=LR, 467 graph [rankdir=LR,
459 splines=polyline 468 splines=polyline
460 ]; 469 ];
461 node [label="\N"]; 470 node [label="\N"];
462 0 [fillcolor="#7F7FFF", 471 0 [fillcolor="#9999FF",
463 fixedsize=true, 472 fixedsize=true,
464 group=default, 473 group=default,
465 height=2, 474 height=0.5,
466 label="0: 7e82d3f3c2cb", 475 label=0,
467 pin=true, 476 pin=true,
468 pos="1,0!", 477 pos="1,0!",
469 shape=circle, 478 shape=circle,
470 style=filled, 479 style=filled,
471 width=2]; 480 width=0.5];
472 4 [fillcolor="#7F7FFF", 481 4 [fillcolor="#9999FF",
473 fixedsize=true, 482 fixedsize=true,
474 group=default, 483 group=default,
475 height=2, 484 height=0.5,
476 label="4: 9ca060c80d74", 485 label=4,
477 pin=true, 486 pin=true,
478 pos="1,4!", 487 pos="1,4!",
479 shape=circle, 488 shape=circle,
480 style=filled, 489 style=filled,
481 width=2]; 490 width=0.5];
482 0 -> 4; 491 0 -> 4 [arrowhead=none,
483 5 [fillcolor="#7F7FFF", 492 penwidth=2.0];
484 fixedsize=true, 493 5 [fillcolor="#9999FF",
485 group=default, 494 fixedsize=true,
486 height=2, 495 group=default,
487 label="5: dfd3a2d7691e", 496 height=0.5,
497 label=5,
488 pin=true, 498 pin=true,
489 pos="1,5!", 499 pos="1,5!",
490 shape=pentagon, 500 shape=pentagon,
491 style=filled, 501 style=filled,
492 width=2]; 502 width=0.5];
493 4 -> 5; 503 4 -> 5 [arrowhead=none,
494 6 [fillcolor="#7F7FFF", 504 penwidth=2.0];
495 fixedsize=true, 505 6 [fillcolor="#9999FF",
496 group=default, 506 fixedsize=true,
497 height=2, 507 group=default,
498 label="6: 41aff6a42b75", 508 height=0.5,
509 label=6,
499 pin=true, 510 pin=true,
500 pos="1,6!", 511 pos="1,6!",
501 shape=pentagon, 512 shape=pentagon,
502 style=filled, 513 style=filled,
503 width=2]; 514 width=0.5];
504 5 -> 6; 515 5 -> 6 [arrowhead=none,
516 penwidth=2.0];
505 } 517 }
506 #endif 518 #endif
507 519
508 Removing changesets 520 Removing changesets
509 ------------------------ 521 ------------------------
556 strict digraph { 568 strict digraph {
557 graph [rankdir=LR, 569 graph [rankdir=LR,
558 splines=polyline 570 splines=polyline
559 ]; 571 ];
560 node [label="\N"]; 572 node [label="\N"];
561 0 [fillcolor="#7F7FFF", 573 0 [fillcolor="#9999FF",
562 fixedsize=true, 574 fixedsize=true,
563 group=default, 575 group=default,
564 height=2, 576 height=0.5,
565 label="0: 7e82d3f3c2cb", 577 label=0,
566 pin=true, 578 pin=true,
567 pos="1,0!", 579 pos="1,0!",
568 shape=circle, 580 shape=circle,
569 style=filled, 581 style=filled,
570 width=2]; 582 width=0.5];
571 4 [fillcolor="#7F7FFF", 583 4 [fillcolor="#9999FF",
572 fixedsize=true, 584 fixedsize=true,
573 group=default, 585 group=default,
574 height=2, 586 height=0.5,
575 label="4: 9ca060c80d74", 587 label=4,
576 pin=true, 588 pin=true,
577 pos="1,4!", 589 pos="1,4!",
578 shape=circle, 590 shape=circle,
579 style=filled, 591 style=filled,
580 width=2]; 592 width=0.5];
581 0 -> 4; 593 0 -> 4 [arrowhead=none,
582 5 [fillcolor="#7F7FFF", 594 penwidth=2.0];
583 fixedsize=true, 595 5 [fillcolor="#9999FF",
584 group=default, 596 fixedsize=true,
585 height=2, 597 group=default,
586 label="5: dfd3a2d7691e", 598 height=0.5,
599 label=5,
587 pin=true, 600 pin=true,
588 pos="1,5!", 601 pos="1,5!",
589 shape=pentagon, 602 shape=pentagon,
590 style=filled, 603 style=filled,
591 width=2]; 604 width=0.5];
592 4 -> 5; 605 4 -> 5 [arrowhead=none,
593 6 [fillcolor="#7F7FFF", 606 penwidth=2.0];
594 fixedsize=true, 607 6 [fillcolor="#9999FF",
595 group=default, 608 fixedsize=true,
596 height=2, 609 group=default,
597 label="6: 41aff6a42b75", 610 height=0.5,
611 label=6,
598 pin=true, 612 pin=true,
599 pos="1,6!", 613 pos="1,6!",
600 shape=pentagon, 614 shape=pentagon,
601 style=filled, 615 style=filled,
602 width=2]; 616 width=0.5];
603 5 -> 6; 617 5 -> 6 [arrowhead=none,
618 penwidth=2.0];
604 } 619 }
605 #endif 620 #endif
606 621
607 Reordering changesets 622 Reordering changesets
608 ------------------------ 623 ------------------------
673 strict digraph { 688 strict digraph {
674 graph [rankdir=LR, 689 graph [rankdir=LR,
675 splines=polyline 690 splines=polyline
676 ]; 691 ];
677 node [label="\N"]; 692 node [label="\N"];
678 0 [fillcolor="#7F7FFF", 693 0 [fillcolor="#9999FF",
679 fixedsize=true, 694 fixedsize=true,
680 group=default, 695 group=default,
681 height=2, 696 height=0.5,
682 label="0: 7e82d3f3c2cb", 697 label=0,
683 pin=true, 698 pin=true,
684 pos="1,0!", 699 pos="1,0!",
685 shape=circle, 700 shape=circle,
686 style=filled, 701 style=filled,
687 width=2]; 702 width=0.5];
688 4 [fillcolor="#7F7FFF", 703 4 [fillcolor="#9999FF",
689 fixedsize=true, 704 fixedsize=true,
690 group=default, 705 group=default,
691 height=2, 706 height=0.5,
692 label="4: 9ca060c80d74", 707 label=4,
693 pin=true, 708 pin=true,
694 pos="1,4!", 709 pos="1,4!",
695 shape=circle, 710 shape=circle,
696 style=filled, 711 style=filled,
697 width=2]; 712 width=0.5];
698 0 -> 4; 713 0 -> 4 [arrowhead=none,
699 5 [fillcolor="#7F7FFF", 714 penwidth=2.0];
700 fixedsize=true, 715 5 [fillcolor="#9999FF",
701 group=default, 716 fixedsize=true,
702 height=2, 717 group=default,
703 label="5: dfd3a2d7691e", 718 height=0.5,
719 label=5,
704 pin=true, 720 pin=true,
705 pos="1,5!", 721 pos="1,5!",
706 shape=pentagon, 722 shape=pentagon,
707 style=filled, 723 style=filled,
708 width=2]; 724 width=0.5];
709 4 -> 5; 725 4 -> 5 [arrowhead=none,
710 6 [fillcolor="#7F7FFF", 726 penwidth=2.0];
711 fixedsize=true, 727 6 [fillcolor="#9999FF",
712 group=default, 728 fixedsize=true,
713 height=2, 729 group=default,
714 label="6: 41aff6a42b75", 730 height=0.5,
731 label=6,
715 pin=true, 732 pin=true,
716 pos="1,6!", 733 pos="1,6!",
717 shape=pentagon, 734 shape=pentagon,
718 style=filled, 735 style=filled,
719 width=2]; 736 width=0.5];
720 5 -> 6; 737 5 -> 6 [arrowhead=none,
721 8 [fillcolor="#7F7FFF", 738 penwidth=2.0];
722 fixedsize=true, 739 8 [fillcolor="#9999FF",
723 group=default, 740 fixedsize=true,
724 height=2, 741 group=default,
725 label="8: 10b8aeaa8cc8", 742 height=0.5,
743 label=8,
726 pin=true, 744 pin=true,
727 pos="1,8!", 745 pos="1,8!",
728 shape=pentagon, 746 shape=pentagon,
729 style=filled, 747 style=filled,
730 width=2]; 748 width=0.5];
731 6 -> 8; 749 6 -> 8 [arrowhead=none,
732 10 [fillcolor="#7F7FFF", 750 penwidth=2.0];
733 fixedsize=true, 751 10 [fillcolor="#9999FF",
734 group=default, 752 fixedsize=true,
735 height=2, 753 group=default,
736 label="10: a224f2a4fb9f", 754 height=0.5,
755 label=10,
737 pin=true, 756 pin=true,
738 pos="1,10!", 757 pos="1,10!",
739 shape=pentagon, 758 shape=pentagon,
740 style=filled, 759 style=filled,
741 width=2]; 760 width=0.5];
742 6 -> 10; 761 6 -> 10 [arrowhead=none,
762 penwidth=2.0];
743 } 763 }
744 #endif 764 #endif
745 765
746 We have a new SPAM SPAM version without the bathroom stuff 766 We have a new SPAM SPAM version without the bathroom stuff
747 767
812 strict digraph { 832 strict digraph {
813 graph [rankdir=LR, 833 graph [rankdir=LR,
814 splines=polyline 834 splines=polyline
815 ]; 835 ];
816 node [label="\N"]; 836 node [label="\N"];
817 0 [fillcolor="#7F7FFF", 837 0 [fillcolor="#9999FF",
818 fixedsize=true, 838 fixedsize=true,
819 group=default, 839 group=default,
820 height=2, 840 height=0.5,
821 label="0: 7e82d3f3c2cb", 841 label=0,
822 pin=true, 842 pin=true,
823 pos="1,0!", 843 pos="1,0!",
824 shape=circle, 844 shape=circle,
825 style=filled, 845 style=filled,
826 width=2]; 846 width=0.5];
827 4 [fillcolor="#7F7FFF", 847 4 [fillcolor="#9999FF",
828 fixedsize=true, 848 fixedsize=true,
829 group=default, 849 group=default,
830 height=2, 850 height=0.5,
831 label="4: 9ca060c80d74", 851 label=4,
832 pin=true, 852 pin=true,
833 pos="1,4!", 853 pos="1,4!",
834 shape=circle, 854 shape=circle,
835 style=filled, 855 style=filled,
836 width=2]; 856 width=0.5];
837 0 -> 4; 857 0 -> 4 [arrowhead=none,
838 5 [fillcolor="#7F7FFF", 858 penwidth=2.0];
839 fixedsize=true, 859 5 [fillcolor="#9999FF",
840 group=default, 860 fixedsize=true,
841 height=2, 861 group=default,
842 label="5: dfd3a2d7691e", 862 height=0.5,
863 label=5,
843 pin=true, 864 pin=true,
844 pos="1,5!", 865 pos="1,5!",
845 shape=circle, 866 shape=circle,
846 style=filled, 867 style=filled,
847 width=2]; 868 width=0.5];
848 4 -> 5; 869 4 -> 5 [arrowhead=none,
849 6 [fillcolor="#7F7FFF", 870 penwidth=2.0];
850 fixedsize=true, 871 6 [fillcolor="#9999FF",
851 group=default, 872 fixedsize=true,
852 height=2, 873 group=default,
853 label="6: 41aff6a42b75", 874 height=0.5,
875 label=6,
854 pin=true, 876 pin=true,
855 pos="1,6!", 877 pos="1,6!",
856 shape=circle, 878 shape=circle,
857 style=filled, 879 style=filled,
858 width=2]; 880 width=0.5];
859 5 -> 6; 881 5 -> 6 [arrowhead=none,
860 10 [fillcolor="#7F7FFF", 882 penwidth=2.0];
861 fixedsize=true, 883 10 [fillcolor="#9999FF",
862 group=default, 884 fixedsize=true,
863 height=2, 885 group=default,
864 label="10: a224f2a4fb9f", 886 height=0.5,
887 label=10,
865 pin=true, 888 pin=true,
866 pos="1,10!", 889 pos="1,10!",
867 shape=circle, 890 shape=circle,
868 style=filled, 891 style=filled,
869 width=2]; 892 width=0.5];
870 6 -> 10; 893 6 -> 10 [arrowhead=none,
871 11 [fillcolor="#7F7FFF", 894 penwidth=2.0];
872 fixedsize=true, 895 11 [fillcolor="#9999FF",
873 group=default, 896 fixedsize=true,
874 height=2, 897 group=default,
875 label="11: 75954b8cd933", 898 height=0.5,
899 label=11,
876 pin=true, 900 pin=true,
877 pos="1,11!", 901 pos="1,11!",
878 shape=pentagon, 902 shape=pentagon,
879 style=filled, 903 style=filled,
880 width=2]; 904 width=0.5];
881 10 -> 11; 905 10 -> 11 [arrowhead=none,
906 penwidth=2.0];
882 } 907 }
883 #endif 908 #endif
884 909
885 Splitting change 910 Splitting change
886 ------------------ 911 ------------------
1098 strict digraph { 1123 strict digraph {
1099 graph [rankdir=LR, 1124 graph [rankdir=LR,
1100 splines=polyline 1125 splines=polyline
1101 ]; 1126 ];
1102 node [label="\N"]; 1127 node [label="\N"];
1103 0 [fillcolor="#7F7FFF", 1128 0 [fillcolor="#9999FF",
1104 fixedsize=true, 1129 fixedsize=true,
1105 group=default, 1130 group=default,
1106 height=2, 1131 height=0.5,
1107 label="0: 7e82d3f3c2cb", 1132 label=0,
1108 pin=true, 1133 pin=true,
1109 pos="1,0!", 1134 pos="1,0!",
1110 shape=circle, 1135 shape=circle,
1111 style=filled, 1136 style=filled,
1112 width=2]; 1137 width=0.5];
1113 4 [fillcolor="#7F7FFF", 1138 4 [fillcolor="#9999FF",
1114 fixedsize=true, 1139 fixedsize=true,
1115 group=default, 1140 group=default,
1116 height=2, 1141 height=0.5,
1117 label="4: 9ca060c80d74", 1142 label=4,
1118 pin=true, 1143 pin=true,
1119 pos="1,4!", 1144 pos="1,4!",
1120 shape=circle, 1145 shape=circle,
1121 style=filled, 1146 style=filled,
1122 width=2]; 1147 width=0.5];
1123 0 -> 4; 1148 0 -> 4 [arrowhead=none,
1124 5 [fillcolor="#7F7FFF", 1149 penwidth=2.0];
1125 fixedsize=true, 1150 5 [fillcolor="#9999FF",
1126 group=default, 1151 fixedsize=true,
1127 height=2, 1152 group=default,
1128 label="5: dfd3a2d7691e", 1153 height=0.5,
1154 label=5,
1129 pin=true, 1155 pin=true,
1130 pos="1,5!", 1156 pos="1,5!",
1131 shape=circle, 1157 shape=circle,
1132 style=filled, 1158 style=filled,
1133 width=2]; 1159 width=0.5];
1134 4 -> 5; 1160 4 -> 5 [arrowhead=none,
1135 6 [fillcolor="#7F7FFF", 1161 penwidth=2.0];
1136 fixedsize=true, 1162 6 [fillcolor="#9999FF",
1137 group=default, 1163 fixedsize=true,
1138 height=2, 1164 group=default,
1139 label="6: 41aff6a42b75", 1165 height=0.5,
1166 label=6,
1140 pin=true, 1167 pin=true,
1141 pos="1,6!", 1168 pos="1,6!",
1142 shape=circle, 1169 shape=circle,
1143 style=filled, 1170 style=filled,
1144 width=2]; 1171 width=0.5];
1145 5 -> 6; 1172 5 -> 6 [arrowhead=none,
1146 10 [fillcolor="#7F7FFF", 1173 penwidth=2.0];
1147 fixedsize=true, 1174 10 [fillcolor="#9999FF",
1148 group=default, 1175 fixedsize=true,
1149 height=2, 1176 group=default,
1150 label="10: a224f2a4fb9f", 1177 height=0.5,
1178 label=10,
1151 pin=true, 1179 pin=true,
1152 pos="1,10!", 1180 pos="1,10!",
1153 shape=circle, 1181 shape=circle,
1154 style=filled, 1182 style=filled,
1155 width=2]; 1183 width=0.5];
1156 6 -> 10; 1184 6 -> 10 [arrowhead=none,
1157 12 [fillcolor="#7F7FFF", 1185 penwidth=2.0];
1158 fixedsize=true, 1186 12 [fillcolor="#9999FF",
1159 group=default, 1187 fixedsize=true,
1160 height=2, 1188 group=default,
1161 label="12: a44c85f957d3", 1189 height=0.5,
1190 label=12,
1162 pin=true, 1191 pin=true,
1163 pos="1,12!", 1192 pos="1,12!",
1164 shape=pentagon, 1193 shape=pentagon,
1165 style=filled, 1194 style=filled,
1166 width=2]; 1195 width=0.5];
1167 10 -> 12; 1196 10 -> 12 [arrowhead=none,
1197 penwidth=2.0];
1168 } 1198 }
1169 #endif 1199 #endif
1170 1200
1171 When we pull from remote again we get an unstable state! 1201 When we pull from remote again we get an unstable state!
1172 1202
1209 strict digraph { 1239 strict digraph {
1210 graph [rankdir=LR, 1240 graph [rankdir=LR,
1211 splines=polyline 1241 splines=polyline
1212 ]; 1242 ];
1213 node [label="\N"]; 1243 node [label="\N"];
1214 0 [fillcolor="#7F7FFF", 1244 0 [fillcolor="#9999FF",
1215 fixedsize=true, 1245 fixedsize=true,
1216 group=default, 1246 group=default,
1217 height=2, 1247 height=0.5,
1218 label="0: 7e82d3f3c2cb", 1248 label=0,
1219 pin=true, 1249 pin=true,
1220 pos="1,0!", 1250 pos="1,0!",
1221 shape=circle, 1251 shape=circle,
1222 style=filled, 1252 style=filled,
1223 width=2]; 1253 width=0.5];
1224 4 [fillcolor="#7F7FFF", 1254 4 [fillcolor="#9999FF",
1225 fixedsize=true, 1255 fixedsize=true,
1226 group=default, 1256 group=default,
1227 height=2, 1257 height=0.5,
1228 label="4: 9ca060c80d74", 1258 label=4,
1229 pin=true, 1259 pin=true,
1230 pos="1,4!", 1260 pos="1,4!",
1231 shape=circle, 1261 shape=circle,
1232 style=filled, 1262 style=filled,
1233 width=2]; 1263 width=0.5];
1234 0 -> 4; 1264 0 -> 4 [arrowhead=none,
1235 5 [fillcolor="#7F7FFF", 1265 penwidth=2.0];
1236 fixedsize=true, 1266 5 [fillcolor="#9999FF",
1237 group=default, 1267 fixedsize=true,
1238 height=2, 1268 group=default,
1239 label="5: dfd3a2d7691e", 1269 height=0.5,
1270 label=5,
1240 pin=true, 1271 pin=true,
1241 pos="1,5!", 1272 pos="1,5!",
1242 shape=circle, 1273 shape=circle,
1243 style=filled, 1274 style=filled,
1244 width=2]; 1275 width=0.5];
1245 4 -> 5; 1276 4 -> 5 [arrowhead=none,
1246 6 [fillcolor="#7F7FFF", 1277 penwidth=2.0];
1247 fixedsize=true, 1278 6 [fillcolor="#9999FF",
1248 group=default, 1279 fixedsize=true,
1249 height=2, 1280 group=default,
1250 label="6: 41aff6a42b75", 1281 height=0.5,
1282 label=6,
1251 pin=true, 1283 pin=true,
1252 pos="1,6!", 1284 pos="1,6!",
1253 shape=circle, 1285 shape=circle,
1254 style=filled, 1286 style=filled,
1255 width=2]; 1287 width=0.5];
1256 5 -> 6; 1288 5 -> 6 [arrowhead=none,
1257 10 [fillcolor="#7F7FFF", 1289 penwidth=2.0];
1258 fixedsize=true, 1290 10 [fillcolor="#9999FF",
1259 group=default, 1291 fixedsize=true,
1260 height=2, 1292 group=default,
1261 label="10: a224f2a4fb9f", 1293 height=0.5,
1294 label=10,
1262 pin=true, 1295 pin=true,
1263 pos="1,10!", 1296 pos="1,10!",
1264 shape=circle, 1297 shape=circle,
1265 style=filled, 1298 style=filled,
1266 width=2]; 1299 width=0.5];
1267 6 -> 10; 1300 6 -> 10 [arrowhead=none,
1301 penwidth=2.0];
1268 11 [fillcolor="#DFDFFF", 1302 11 [fillcolor="#DFDFFF",
1269 fixedsize=true, 1303 fixedsize=true,
1270 group=default_alt, 1304 group=default_alt,
1271 height=2, 1305 height=0.5,
1272 label="11: 75954b8cd933", 1306 label=11,
1273 pin=true, 1307 pin=true,
1274 pos="2,11!", 1308 pos="2,11!",
1275 shape=pentagon, 1309 shape=pentagon,
1276 style="dotted, filled", 1310 style="dotted, filled",
1277 width=2]; 1311 width=0.5];
1278 10 -> 11; 1312 10 -> 11 [arrowhead=none,
1279 12 [fillcolor="#7F7FFF", 1313 penwidth=2.0];
1280 fixedsize=true, 1314 12 [fillcolor="#9999FF",
1281 group=default, 1315 fixedsize=true,
1282 height=2, 1316 group=default,
1283 label="12: a44c85f957d3", 1317 height=0.5,
1318 label=12,
1284 pin=true, 1319 pin=true,
1285 pos="1,12!", 1320 pos="1,12!",
1286 shape=pentagon, 1321 shape=pentagon,
1287 style=filled, 1322 style=filled,
1288 width=2]; 1323 width=0.5];
1289 10 -> 12; 1324 10 -> 12 [arrowhead=none,
1290 11 -> 12 [arrowtail=dot, 1325 penwidth=2.0];
1291 dir=back, 1326 11 -> 12 [arrowhead=none,
1292 minlen=0, 1327 minlen=0,
1293 style=dotted]; 1328 penwidth=2.0,
1294 13 [fillcolor="#FF3535", 1329 style=dashed];
1330 13 [fillcolor="#FF4F4F",
1295 fixedsize=true, 1331 fixedsize=true,
1296 group=default_alt, 1332 group=default_alt,
1297 height=2, 1333 height=0.5,
1298 label="13: bf1b0d202029", 1334 label=13,
1299 pin=true, 1335 pin=true,
1300 pos="2,13!", 1336 pos="2,13!",
1301 shape=pentagon, 1337 shape=pentagon,
1302 style=filled, 1338 style=filled,
1303 width=2]; 1339 width=0.5];
1304 11 -> 13; 1340 11 -> 13 [arrowhead=none,
1341 penwidth=2.0];
1305 } 1342 }
1306 #endif 1343 #endif
1307 1344
1308 The older version 75954b8cd933 never ceased to exist in the local repo. It was 1345 The older version 75954b8cd933 never ceased to exist in the local repo. It was
1309 just hidden and excluded from pull and push. 1346 just hidden and excluded from pull and push.
1364 strict digraph { 1401 strict digraph {
1365 graph [rankdir=LR, 1402 graph [rankdir=LR,
1366 splines=polyline 1403 splines=polyline
1367 ]; 1404 ];
1368 node [label="\N"]; 1405 node [label="\N"];
1369 0 [fillcolor="#7F7FFF", 1406 0 [fillcolor="#9999FF",
1370 fixedsize=true, 1407 fixedsize=true,
1371 group=default, 1408 group=default,
1372 height=2, 1409 height=0.5,
1373 label="0: 7e82d3f3c2cb", 1410 label=0,
1374 pin=true, 1411 pin=true,
1375 pos="1,0!", 1412 pos="1,0!",
1376 shape=circle, 1413 shape=circle,
1377 style=filled, 1414 style=filled,
1378 width=2]; 1415 width=0.5];
1379 4 [fillcolor="#7F7FFF", 1416 4 [fillcolor="#9999FF",
1380 fixedsize=true, 1417 fixedsize=true,
1381 group=default, 1418 group=default,
1382 height=2, 1419 height=0.5,
1383 label="4: 9ca060c80d74", 1420 label=4,
1384 pin=true, 1421 pin=true,
1385 pos="1,4!", 1422 pos="1,4!",
1386 shape=circle, 1423 shape=circle,
1387 style=filled, 1424 style=filled,
1388 width=2]; 1425 width=0.5];
1389 0 -> 4; 1426 0 -> 4 [arrowhead=none,
1390 5 [fillcolor="#7F7FFF", 1427 penwidth=2.0];
1391 fixedsize=true, 1428 5 [fillcolor="#9999FF",
1392 group=default, 1429 fixedsize=true,
1393 height=2, 1430 group=default,
1394 label="5: dfd3a2d7691e", 1431 height=0.5,
1432 label=5,
1395 pin=true, 1433 pin=true,
1396 pos="1,5!", 1434 pos="1,5!",
1397 shape=circle, 1435 shape=circle,
1398 style=filled, 1436 style=filled,
1399 width=2]; 1437 width=0.5];
1400 4 -> 5; 1438 4 -> 5 [arrowhead=none,
1401 6 [fillcolor="#7F7FFF", 1439 penwidth=2.0];
1402 fixedsize=true, 1440 6 [fillcolor="#9999FF",
1403 group=default, 1441 fixedsize=true,
1404 height=2, 1442 group=default,
1405 label="6: 41aff6a42b75", 1443 height=0.5,
1444 label=6,
1406 pin=true, 1445 pin=true,
1407 pos="1,6!", 1446 pos="1,6!",
1408 shape=circle, 1447 shape=circle,
1409 style=filled, 1448 style=filled,
1410 width=2]; 1449 width=0.5];
1411 5 -> 6; 1450 5 -> 6 [arrowhead=none,
1412 10 [fillcolor="#7F7FFF", 1451 penwidth=2.0];
1413 fixedsize=true, 1452 10 [fillcolor="#9999FF",
1414 group=default, 1453 fixedsize=true,
1415 height=2, 1454 group=default,
1416 label="10: a224f2a4fb9f", 1455 height=0.5,
1456 label=10,
1417 pin=true, 1457 pin=true,
1418 pos="1,10!", 1458 pos="1,10!",
1419 shape=circle, 1459 shape=circle,
1420 style=filled, 1460 style=filled,
1421 width=2]; 1461 width=0.5];
1422 6 -> 10; 1462 6 -> 10 [arrowhead=none,
1423 12 [fillcolor="#7F7FFF", 1463 penwidth=2.0];
1424 fixedsize=true, 1464 12 [fillcolor="#9999FF",
1425 group=default, 1465 fixedsize=true,
1426 height=2, 1466 group=default,
1427 label="12: a44c85f957d3", 1467 height=0.5,
1468 label=12,
1428 pin=true, 1469 pin=true,
1429 pos="1,12!", 1470 pos="1,12!",
1430 shape=pentagon, 1471 shape=pentagon,
1431 style=filled, 1472 style=filled,
1432 width=2]; 1473 width=0.5];
1433 10 -> 12; 1474 10 -> 12 [arrowhead=none,
1434 14 [fillcolor="#7F7FFF", 1475 penwidth=2.0];
1435 fixedsize=true, 1476 14 [fillcolor="#9999FF",
1436 group=default, 1477 fixedsize=true,
1437 height=2, 1478 group=default,
1438 label="14: ee942144f952", 1479 height=0.5,
1480 label=14,
1439 pin=true, 1481 pin=true,
1440 pos="1,14!", 1482 pos="1,14!",
1441 shape=pentagon, 1483 shape=pentagon,
1442 style=filled, 1484 style=filled,
1443 width=2]; 1485 width=0.5];
1444 12 -> 14; 1486 12 -> 14 [arrowhead=none,
1487 penwidth=2.0];
1445 } 1488 }
1446 #endif 1489 #endif
1447 1490
1448 We can push this evolution to remote. 1491 We can push this evolution to remote.
1449 1492
1523 strict digraph { 1566 strict digraph {
1524 graph [rankdir=LR, 1567 graph [rankdir=LR,
1525 splines=polyline 1568 splines=polyline
1526 ]; 1569 ];
1527 node [label="\N"]; 1570 node [label="\N"];
1528 0 [fillcolor="#7F7FFF", 1571 0 [fillcolor="#9999FF",
1529 fixedsize=true, 1572 fixedsize=true,
1530 group=default, 1573 group=default,
1531 height=2, 1574 height=0.5,
1532 label="0: 7e82d3f3c2cb", 1575 label=0,
1533 pin=true, 1576 pin=true,
1534 pos="1,0!", 1577 pos="1,0!",
1535 shape=circle, 1578 shape=circle,
1536 style=filled, 1579 style=filled,
1537 width=2]; 1580 width=0.5];
1538 4 [fillcolor="#7F7FFF", 1581 4 [fillcolor="#9999FF",
1539 fixedsize=true, 1582 fixedsize=true,
1540 group=default, 1583 group=default,
1541 height=2, 1584 height=0.5,
1542 label="4: 9ca060c80d74", 1585 label=4,
1543 pin=true, 1586 pin=true,
1544 pos="1,4!", 1587 pos="1,4!",
1545 shape=circle, 1588 shape=circle,
1546 style=filled, 1589 style=filled,
1547 width=2]; 1590 width=0.5];
1548 0 -> 4; 1591 0 -> 4 [arrowhead=none,
1549 5 [fillcolor="#7F7FFF", 1592 penwidth=2.0];
1550 fixedsize=true, 1593 5 [fillcolor="#9999FF",
1551 group=default, 1594 fixedsize=true,
1552 height=2, 1595 group=default,
1553 label="5: dfd3a2d7691e", 1596 height=0.5,
1597 label=5,
1554 pin=true, 1598 pin=true,
1555 pos="1,5!", 1599 pos="1,5!",
1556 shape=circle, 1600 shape=circle,
1557 style=filled, 1601 style=filled,
1558 width=2]; 1602 width=0.5];
1559 4 -> 5; 1603 4 -> 5 [arrowhead=none,
1560 6 [fillcolor="#7F7FFF", 1604 penwidth=2.0];
1561 fixedsize=true, 1605 6 [fillcolor="#9999FF",
1562 group=default, 1606 fixedsize=true,
1563 height=2, 1607 group=default,
1564 label="6: 41aff6a42b75", 1608 height=0.5,
1609 label=6,
1565 pin=true, 1610 pin=true,
1566 pos="1,6!", 1611 pos="1,6!",
1567 shape=circle, 1612 shape=circle,
1568 style=filled, 1613 style=filled,
1569 width=2]; 1614 width=0.5];
1570 5 -> 6; 1615 5 -> 6 [arrowhead=none,
1571 10 [fillcolor="#7F7FFF", 1616 penwidth=2.0];
1572 fixedsize=true, 1617 10 [fillcolor="#9999FF",
1573 group=default, 1618 fixedsize=true,
1574 height=2, 1619 group=default,
1575 label="10: a224f2a4fb9f", 1620 height=0.5,
1621 label=10,
1576 pin=true, 1622 pin=true,
1577 pos="1,10!", 1623 pos="1,10!",
1578 shape=circle, 1624 shape=circle,
1579 style=filled, 1625 style=filled,
1580 width=2]; 1626 width=0.5];
1581 6 -> 10; 1627 6 -> 10 [arrowhead=none,
1582 12 [fillcolor="#7F7FFF", 1628 penwidth=2.0];
1583 fixedsize=true, 1629 12 [fillcolor="#9999FF",
1584 group=default, 1630 fixedsize=true,
1585 height=2, 1631 group=default,
1586 label="12: a44c85f957d3", 1632 height=0.5,
1633 label=12,
1587 pin=true, 1634 pin=true,
1588 pos="1,12!", 1635 pos="1,12!",
1589 shape=pentagon, 1636 shape=pentagon,
1590 style=filled, 1637 style=filled,
1591 width=2]; 1638 width=0.5];
1592 10 -> 12; 1639 10 -> 12 [arrowhead=none,
1593 14 [fillcolor="#7F7FFF", 1640 penwidth=2.0];
1594 fixedsize=true, 1641 14 [fillcolor="#9999FF",
1595 group=default, 1642 fixedsize=true,
1596 height=2, 1643 group=default,
1597 label="14: ee942144f952", 1644 height=0.5,
1645 label=14,
1598 pin=true, 1646 pin=true,
1599 pos="1,14!", 1647 pos="1,14!",
1600 shape=pentagon, 1648 shape=pentagon,
1601 style=filled, 1649 style=filled,
1602 width=2]; 1650 width=0.5];
1603 12 -> 14; 1651 12 -> 14 [arrowhead=none,
1604 15 [fillcolor="#7F7FFF", 1652 penwidth=2.0];
1605 fixedsize=true, 1653 15 [fillcolor="#9999FF",
1606 group=default, 1654 fixedsize=true,
1607 height=2, 1655 group=default,
1608 label="15: 99f039c5ec9e", 1656 height=0.5,
1657 label=15,
1609 pin=true, 1658 pin=true,
1610 pos="1,15!", 1659 pos="1,15!",
1611 shape=pentagon, 1660 shape=pentagon,
1612 style=filled, 1661 style=filled,
1613 width=2]; 1662 width=0.5];
1614 14 -> 15; 1663 14 -> 15 [arrowhead=none,
1664 penwidth=2.0];
1615 } 1665 }
1616 #endif 1666 #endif
1617 1667
1618 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: 1668 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
1619 1669
1652 strict digraph { 1702 strict digraph {
1653 graph [rankdir=LR, 1703 graph [rankdir=LR,
1654 splines=polyline 1704 splines=polyline
1655 ]; 1705 ];
1656 node [label="\N"]; 1706 node [label="\N"];
1657 0 [fillcolor="#7F7FFF", 1707 0 [fillcolor="#9999FF",
1658 fixedsize=true, 1708 fixedsize=true,
1659 group=default, 1709 group=default,
1660 height=2, 1710 height=0.5,
1661 label="0: 7e82d3f3c2cb", 1711 label=0,
1662 pin=true, 1712 pin=true,
1663 pos="1,0!", 1713 pos="1,0!",
1664 shape=circle, 1714 shape=circle,
1665 style=filled, 1715 style=filled,
1666 width=2]; 1716 width=0.5];
1667 4 [fillcolor="#7F7FFF", 1717 4 [fillcolor="#9999FF",
1668 fixedsize=true, 1718 fixedsize=true,
1669 group=default, 1719 group=default,
1670 height=2, 1720 height=0.5,
1671 label="4: 9ca060c80d74", 1721 label=4,
1672 pin=true, 1722 pin=true,
1673 pos="1,4!", 1723 pos="1,4!",
1674 shape=circle, 1724 shape=circle,
1675 style=filled, 1725 style=filled,
1676 width=2]; 1726 width=0.5];
1677 0 -> 4; 1727 0 -> 4 [arrowhead=none,
1678 5 [fillcolor="#7F7FFF", 1728 penwidth=2.0];
1679 fixedsize=true, 1729 5 [fillcolor="#9999FF",
1680 group=default, 1730 fixedsize=true,
1681 height=2, 1731 group=default,
1682 label="5: dfd3a2d7691e", 1732 height=0.5,
1733 label=5,
1683 pin=true, 1734 pin=true,
1684 pos="1,5!", 1735 pos="1,5!",
1685 shape=circle, 1736 shape=circle,
1686 style=filled, 1737 style=filled,
1687 width=2]; 1738 width=0.5];
1688 4 -> 5; 1739 4 -> 5 [arrowhead=none,
1689 6 [fillcolor="#7F7FFF", 1740 penwidth=2.0];
1690 fixedsize=true, 1741 6 [fillcolor="#9999FF",
1691 group=default, 1742 fixedsize=true,
1692 height=2, 1743 group=default,
1693 label="6: 41aff6a42b75", 1744 height=0.5,
1745 label=6,
1694 pin=true, 1746 pin=true,
1695 pos="1,6!", 1747 pos="1,6!",
1696 shape=circle, 1748 shape=circle,
1697 style=filled, 1749 style=filled,
1698 width=2]; 1750 width=0.5];
1699 5 -> 6; 1751 5 -> 6 [arrowhead=none,
1700 10 [fillcolor="#7F7FFF", 1752 penwidth=2.0];
1701 fixedsize=true, 1753 10 [fillcolor="#9999FF",
1702 group=default, 1754 fixedsize=true,
1703 height=2, 1755 group=default,
1704 label="10: a224f2a4fb9f", 1756 height=0.5,
1757 label=10,
1705 pin=true, 1758 pin=true,
1706 pos="1,10!", 1759 pos="1,10!",
1707 shape=circle, 1760 shape=circle,
1708 style=filled, 1761 style=filled,
1709 width=2]; 1762 width=0.5];
1710 6 -> 10; 1763 6 -> 10 [arrowhead=none,
1711 12 [fillcolor="#7F7FFF", 1764 penwidth=2.0];
1712 fixedsize=true, 1765 12 [fillcolor="#9999FF",
1713 group=default, 1766 fixedsize=true,
1714 height=2, 1767 group=default,
1715 label="12: a44c85f957d3", 1768 height=0.5,
1769 label=12,
1716 pin=true, 1770 pin=true,
1717 pos="1,12!", 1771 pos="1,12!",
1718 shape=pentagon, 1772 shape=pentagon,
1719 style=filled, 1773 style=filled,
1720 width=2]; 1774 width=0.5];
1721 10 -> 12; 1775 10 -> 12 [arrowhead=none,
1776 penwidth=2.0];
1722 14 [fillcolor="#DFDFFF", 1777 14 [fillcolor="#DFDFFF",
1723 fixedsize=true, 1778 fixedsize=true,
1724 group=default_alt, 1779 group=default_alt,
1725 height=2, 1780 height=0.5,
1726 label="14: ee942144f952", 1781 label=14,
1727 pin=true, 1782 pin=true,
1728 pos="2,14!", 1783 pos="2,14!",
1729 shape=pentagon, 1784 shape=pentagon,
1730 style="dotted, filled", 1785 style="dotted, filled",
1731 width=2]; 1786 width=0.5];
1732 12 -> 14; 1787 12 -> 14 [arrowhead=none,
1733 15 [fillcolor="#FF3535", 1788 penwidth=2.0];
1789 15 [fillcolor="#FF4F4F",
1734 fixedsize=true, 1790 fixedsize=true,
1735 group=default_alt, 1791 group=default_alt,
1736 height=2, 1792 height=0.5,
1737 label="15: 99f039c5ec9e", 1793 label=15,
1738 pin=true, 1794 pin=true,
1739 pos="2,15!", 1795 pos="2,15!",
1740 shape=pentagon, 1796 shape=pentagon,
1741 style=filled, 1797 style=filled,
1742 width=2]; 1798 width=0.5];
1743 14 -> 15; 1799 14 -> 15 [arrowhead=none,
1800 penwidth=2.0];
1744 } 1801 }
1745 #endif 1802 #endif
1746 1803
1747 $ hg log -r "orphan()" 1804 $ hg log -r "orphan()"
1748 99f039c5ec9e (draft): SPAM SPAM SPAM 1805 99f039c5ec9e (draft): SPAM SPAM SPAM
1754 strict digraph { 1811 strict digraph {
1755 graph [rankdir=LR, 1812 graph [rankdir=LR,
1756 splines=polyline 1813 splines=polyline
1757 ]; 1814 ];
1758 node [label="\N"]; 1815 node [label="\N"];
1759 15 [fillcolor="#FF3535", 1816 15 [fillcolor="#FF4F4F",
1760 fixedsize=true, 1817 fixedsize=true,
1761 group=default_alt, 1818 group=default_alt,
1762 height=2, 1819 height=0.5,
1763 label="15: 99f039c5ec9e", 1820 label=15,
1764 pin=true, 1821 pin=true,
1765 pos="1,15!", 1822 pos="1,15!",
1766 shape=pentagon, 1823 shape=pentagon,
1767 style=filled, 1824 style=filled,
1768 width=2]; 1825 width=0.5];
1769 } 1826 }
1770 #endif 1827 #endif
1771 1828
1772 $ hg evolve 1829 $ hg evolve
1773 move:[15] SPAM SPAM SPAM 1830 move:[15] SPAM SPAM SPAM
1798 strict digraph { 1855 strict digraph {
1799 graph [rankdir=LR, 1856 graph [rankdir=LR,
1800 splines=polyline 1857 splines=polyline
1801 ]; 1858 ];
1802 node [label="\N"]; 1859 node [label="\N"];
1803 0 [fillcolor="#7F7FFF", 1860 0 [fillcolor="#9999FF",
1804 fixedsize=true, 1861 fixedsize=true,
1805 group=default, 1862 group=default,
1806 height=2, 1863 height=0.5,
1807 label="0: 7e82d3f3c2cb", 1864 label=0,
1808 pin=true, 1865 pin=true,
1809 pos="1,0!", 1866 pos="1,0!",
1810 shape=circle, 1867 shape=circle,
1811 style=filled, 1868 style=filled,
1812 width=2]; 1869 width=0.5];
1813 4 [fillcolor="#7F7FFF", 1870 4 [fillcolor="#9999FF",
1814 fixedsize=true, 1871 fixedsize=true,
1815 group=default, 1872 group=default,
1816 height=2, 1873 height=0.5,
1817 label="4: 9ca060c80d74", 1874 label=4,
1818 pin=true, 1875 pin=true,
1819 pos="1,4!", 1876 pos="1,4!",
1820 shape=circle, 1877 shape=circle,
1821 style=filled, 1878 style=filled,
1822 width=2]; 1879 width=0.5];
1823 0 -> 4; 1880 0 -> 4 [arrowhead=none,
1824 5 [fillcolor="#7F7FFF", 1881 penwidth=2.0];
1825 fixedsize=true, 1882 5 [fillcolor="#9999FF",
1826 group=default, 1883 fixedsize=true,
1827 height=2, 1884 group=default,
1828 label="5: dfd3a2d7691e", 1885 height=0.5,
1886 label=5,
1829 pin=true, 1887 pin=true,
1830 pos="1,5!", 1888 pos="1,5!",
1831 shape=circle, 1889 shape=circle,
1832 style=filled, 1890 style=filled,
1833 width=2]; 1891 width=0.5];
1834 4 -> 5; 1892 4 -> 5 [arrowhead=none,
1835 6 [fillcolor="#7F7FFF", 1893 penwidth=2.0];
1836 fixedsize=true, 1894 6 [fillcolor="#9999FF",
1837 group=default, 1895 fixedsize=true,
1838 height=2, 1896 group=default,
1839 label="6: 41aff6a42b75", 1897 height=0.5,
1898 label=6,
1840 pin=true, 1899 pin=true,
1841 pos="1,6!", 1900 pos="1,6!",
1842 shape=circle, 1901 shape=circle,
1843 style=filled, 1902 style=filled,
1844 width=2]; 1903 width=0.5];
1845 5 -> 6; 1904 5 -> 6 [arrowhead=none,
1846 10 [fillcolor="#7F7FFF", 1905 penwidth=2.0];
1847 fixedsize=true, 1906 10 [fillcolor="#9999FF",
1848 group=default, 1907 fixedsize=true,
1849 height=2, 1908 group=default,
1850 label="10: a224f2a4fb9f", 1909 height=0.5,
1910 label=10,
1851 pin=true, 1911 pin=true,
1852 pos="1,10!", 1912 pos="1,10!",
1853 shape=circle, 1913 shape=circle,
1854 style=filled, 1914 style=filled,
1855 width=2]; 1915 width=0.5];
1856 6 -> 10; 1916 6 -> 10 [arrowhead=none,
1857 12 [fillcolor="#7F7FFF", 1917 penwidth=2.0];
1858 fixedsize=true, 1918 12 [fillcolor="#9999FF",
1859 group=default, 1919 fixedsize=true,
1860 height=2, 1920 group=default,
1861 label="12: a44c85f957d3", 1921 height=0.5,
1922 label=12,
1862 pin=true, 1923 pin=true,
1863 pos="1,12!", 1924 pos="1,12!",
1864 shape=pentagon, 1925 shape=pentagon,
1865 style=filled, 1926 style=filled,
1866 width=2]; 1927 width=0.5];
1867 10 -> 12; 1928 10 -> 12 [arrowhead=none,
1868 16 [fillcolor="#7F7FFF", 1929 penwidth=2.0];
1869 fixedsize=true, 1930 16 [fillcolor="#9999FF",
1870 group=default, 1931 fixedsize=true,
1871 height=2, 1932 group=default,
1872 label="16: 40aa40daeefb", 1933 height=0.5,
1934 label=16,
1873 pin=true, 1935 pin=true,
1874 pos="1,16!", 1936 pos="1,16!",
1875 shape=pentagon, 1937 shape=pentagon,
1876 style=filled, 1938 style=filled,
1877 width=2]; 1939 width=0.5];
1878 12 -> 16; 1940 12 -> 16 [arrowhead=none,
1941 penwidth=2.0];
1879 } 1942 }
1880 #endif 1943 #endif
1881 1944
1882 Handling Divergent amend 1945 Handling Divergent amend
1883 ---------------------------------------------- 1946 ----------------------------------------------