409 shape=pentagon, |
409 shape=pentagon, |
410 style=filled, |
410 style=filled, |
411 width=0.5]; |
411 width=0.5]; |
412 0 -> 1 [arrowhead=none, |
412 0 -> 1 [arrowhead=none, |
413 penwidth=2.0]; |
413 penwidth=2.0]; |
|
414 5 [fillcolor="#9999FF", |
|
415 fixedsize=true, |
|
416 group=default, |
|
417 height=0.5, |
|
418 label=5, |
|
419 pin=true, |
|
420 pos="1,5!", |
|
421 shape=circle, |
|
422 style=filled, |
|
423 width=0.5]; |
|
424 0 -> 5 [arrowhead=none, |
|
425 penwidth=2.0]; |
414 4 [fillcolor="#9999FF", |
426 4 [fillcolor="#9999FF", |
415 fixedsize=true, |
427 fixedsize=true, |
416 group=default, |
428 group=default, |
417 height=0.5, |
429 height=0.5, |
418 label=4, |
430 label=4, |
419 pin=true, |
431 pin=true, |
420 pos="1,4!", |
432 pos="1,4!", |
421 shape=circle, |
433 shape=pentagon, |
422 style=filled, |
434 style=filled, |
423 width=0.5]; |
435 width=0.5]; |
424 0 -> 4 [arrowhead=none, |
436 1 -> 4 [arrowhead=none, |
425 penwidth=2.0]; |
|
426 3 [fillcolor="#9999FF", |
|
427 fixedsize=true, |
|
428 group=default, |
|
429 height=0.5, |
|
430 label=3, |
|
431 pin=true, |
|
432 pos="1,3!", |
|
433 shape=pentagon, |
|
434 style=filled, |
|
435 width=0.5]; |
|
436 1 -> 3 [arrowhead=none, |
|
437 penwidth=2.0]; |
437 penwidth=2.0]; |
438 } |
438 } |
439 #endif |
439 #endif |
440 |
440 |
441 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 |
442 |
442 |
443 $ hg diff |
443 $ hg diff |
444 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 |
444 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 |
445 rebasing 1:4d5dc8187023 "adding condiment" |
445 rebasing 1:4d5dc8187023 "adding condiment" |
446 merging shopping |
446 merging shopping |
447 rebasing 3:9d0363b81950 "adding fruit" |
447 rebasing 4:9d0363b81950 "adding fruit" |
448 merging shopping |
448 merging shopping |
449 |
449 |
450 |
450 |
451 My local work is now rebased on the remote one. |
451 My local work is now rebased on the remote one. |
452 |
452 |
476 pin=true, |
476 pin=true, |
477 pos="1,0!", |
477 pos="1,0!", |
478 shape=circle, |
478 shape=circle, |
479 style=filled, |
479 style=filled, |
480 width=0.5]; |
480 width=0.5]; |
481 4 [fillcolor="#9999FF", |
|
482 fixedsize=true, |
|
483 group=default, |
|
484 height=0.5, |
|
485 label=4, |
|
486 pin=true, |
|
487 pos="1,4!", |
|
488 shape=circle, |
|
489 style=filled, |
|
490 width=0.5]; |
|
491 0 -> 4 [arrowhead=none, |
|
492 penwidth=2.0]; |
|
493 5 [fillcolor="#9999FF", |
481 5 [fillcolor="#9999FF", |
494 fixedsize=true, |
482 fixedsize=true, |
495 group=default, |
483 group=default, |
496 height=0.5, |
484 height=0.5, |
497 label=5, |
485 label=5, |
498 pin=true, |
486 pin=true, |
499 pos="1,5!", |
487 pos="1,5!", |
500 shape=pentagon, |
488 shape=circle, |
501 style=filled, |
489 style=filled, |
502 width=0.5]; |
490 width=0.5]; |
503 4 -> 5 [arrowhead=none, |
491 0 -> 5 [arrowhead=none, |
504 penwidth=2.0]; |
492 penwidth=2.0]; |
505 6 [fillcolor="#9999FF", |
493 6 [fillcolor="#9999FF", |
506 fixedsize=true, |
494 fixedsize=true, |
507 group=default, |
495 group=default, |
508 height=0.5, |
496 height=0.5, |
578 pin=true, |
578 pin=true, |
579 pos="1,0!", |
579 pos="1,0!", |
580 shape=circle, |
580 shape=circle, |
581 style=filled, |
581 style=filled, |
582 width=0.5]; |
582 width=0.5]; |
583 4 [fillcolor="#9999FF", |
|
584 fixedsize=true, |
|
585 group=default, |
|
586 height=0.5, |
|
587 label=4, |
|
588 pin=true, |
|
589 pos="1,4!", |
|
590 shape=circle, |
|
591 style=filled, |
|
592 width=0.5]; |
|
593 0 -> 4 [arrowhead=none, |
|
594 penwidth=2.0]; |
|
595 5 [fillcolor="#9999FF", |
583 5 [fillcolor="#9999FF", |
596 fixedsize=true, |
584 fixedsize=true, |
597 group=default, |
585 group=default, |
598 height=0.5, |
586 height=0.5, |
599 label=5, |
587 label=5, |
600 pin=true, |
588 pin=true, |
601 pos="1,5!", |
589 pos="1,5!", |
602 shape=pentagon, |
590 shape=circle, |
603 style=filled, |
591 style=filled, |
604 width=0.5]; |
592 width=0.5]; |
605 4 -> 5 [arrowhead=none, |
593 0 -> 5 [arrowhead=none, |
606 penwidth=2.0]; |
594 penwidth=2.0]; |
607 6 [fillcolor="#9999FF", |
595 6 [fillcolor="#9999FF", |
608 fixedsize=true, |
596 fixedsize=true, |
609 group=default, |
597 group=default, |
610 height=0.5, |
598 height=0.5, |
662 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` |
662 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` |
663 |
663 |
664 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
664 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent |
665 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
665 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
666 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent |
666 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent |
667 rebasing 9:fac207dec9f5 "SPAM SPAM" (tip) |
667 rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) |
668 merging shopping |
668 merging shopping |
669 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
669 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
670 $ hg log -G |
670 $ hg log -G |
671 @ a224f2a4fb9f (draft): SPAM SPAM |
671 @ a224f2a4fb9f (draft): SPAM SPAM |
672 | |
672 | |
698 pin=true, |
698 pin=true, |
699 pos="1,0!", |
699 pos="1,0!", |
700 shape=circle, |
700 shape=circle, |
701 style=filled, |
701 style=filled, |
702 width=0.5]; |
702 width=0.5]; |
703 4 [fillcolor="#9999FF", |
|
704 fixedsize=true, |
|
705 group=default, |
|
706 height=0.5, |
|
707 label=4, |
|
708 pin=true, |
|
709 pos="1,4!", |
|
710 shape=circle, |
|
711 style=filled, |
|
712 width=0.5]; |
|
713 0 -> 4 [arrowhead=none, |
|
714 penwidth=2.0]; |
|
715 5 [fillcolor="#9999FF", |
703 5 [fillcolor="#9999FF", |
716 fixedsize=true, |
704 fixedsize=true, |
717 group=default, |
705 group=default, |
718 height=0.5, |
706 height=0.5, |
719 label=5, |
707 label=5, |
720 pin=true, |
708 pin=true, |
721 pos="1,5!", |
709 pos="1,5!", |
722 shape=pentagon, |
710 shape=circle, |
723 style=filled, |
711 style=filled, |
724 width=0.5]; |
712 width=0.5]; |
725 4 -> 5 [arrowhead=none, |
713 0 -> 5 [arrowhead=none, |
726 penwidth=2.0]; |
714 penwidth=2.0]; |
727 6 [fillcolor="#9999FF", |
715 6 [fillcolor="#9999FF", |
728 fixedsize=true, |
716 fixedsize=true, |
729 group=default, |
717 group=default, |
730 height=0.5, |
718 height=0.5, |
734 shape=pentagon, |
722 shape=pentagon, |
735 style=filled, |
723 style=filled, |
736 width=0.5]; |
724 width=0.5]; |
737 5 -> 6 [arrowhead=none, |
725 5 -> 6 [arrowhead=none, |
738 penwidth=2.0]; |
726 penwidth=2.0]; |
739 8 [fillcolor="#9999FF", |
727 7 [fillcolor="#9999FF", |
740 fixedsize=true, |
728 fixedsize=true, |
741 group=default, |
729 group=default, |
742 height=0.5, |
730 height=0.5, |
743 label=8, |
731 label=7, |
744 pin=true, |
732 pin=true, |
745 pos="1,8!", |
733 pos="1,7!", |
746 shape=pentagon, |
734 shape=pentagon, |
747 style=filled, |
735 style=filled, |
748 width=0.5]; |
736 width=0.5]; |
749 6 -> 8 [arrowhead=none, |
737 6 -> 7 [arrowhead=none, |
750 penwidth=2.0]; |
738 penwidth=2.0]; |
751 10 [fillcolor="#9999FF", |
739 9 [fillcolor="#9999FF", |
752 fixedsize=true, |
740 fixedsize=true, |
753 group=default, |
741 group=default, |
754 height=0.5, |
742 height=0.5, |
755 label=10, |
743 label=9, |
756 pin=true, |
744 pin=true, |
757 pos="1,10!", |
745 pos="1,9!", |
758 shape=pentagon, |
746 shape=pentagon, |
759 style=filled, |
747 style=filled, |
760 width=0.5]; |
748 width=0.5]; |
761 6 -> 10 [arrowhead=none, |
749 7 -> 9 [arrowhead=none, |
|
750 penwidth=2.0]; |
|
751 11 [fillcolor="#9999FF", |
|
752 fixedsize=true, |
|
753 group=default, |
|
754 height=0.5, |
|
755 label=11, |
|
756 pin=true, |
|
757 pos="1,11!", |
|
758 shape=pentagon, |
|
759 style=filled, |
|
760 width=0.5]; |
|
761 7 -> 11 [arrowhead=none, |
762 penwidth=2.0]; |
762 penwidth=2.0]; |
763 } |
763 } |
764 #endif |
764 #endif |
765 |
765 |
766 We have a new SPAM SPAM version without the bathroom stuff |
766 We have a new SPAM SPAM version without the bathroom stuff |
800 searching for changes |
800 searching for changes |
801 adding changesets |
801 adding changesets |
802 adding manifests |
802 adding manifests |
803 adding file changes |
803 adding file changes |
804 added 3 changesets with 3 changes to 1 files |
804 added 3 changesets with 3 changes to 1 files |
805 5 new obsolescence markers |
805 6 new obsolescence markers |
806 |
806 |
807 for simplicity sake we get the bathroom change in line again |
807 for simplicity sake we get the bathroom change in line again |
808 |
808 |
809 $ hg grab 10b8aeaa8cc8 |
809 $ hg grab 10b8aeaa8cc8 |
810 rebasing 8:10b8aeaa8cc8 "bathroom stuff" |
810 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
811 merging shopping |
811 merging shopping |
812 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
812 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
813 $ hg phase --draft . |
813 $ hg phase --draft . |
814 $ hg log -G |
814 $ hg log -G |
815 @ 75954b8cd933 (draft): bathroom stuff |
815 @ 75954b8cd933 (draft): bathroom stuff |
842 pin=true, |
842 pin=true, |
843 pos="1,0!", |
843 pos="1,0!", |
844 shape=circle, |
844 shape=circle, |
845 style=filled, |
845 style=filled, |
846 width=0.5]; |
846 width=0.5]; |
847 4 [fillcolor="#9999FF", |
|
848 fixedsize=true, |
|
849 group=default, |
|
850 height=0.5, |
|
851 label=4, |
|
852 pin=true, |
|
853 pos="1,4!", |
|
854 shape=circle, |
|
855 style=filled, |
|
856 width=0.5]; |
|
857 0 -> 4 [arrowhead=none, |
|
858 penwidth=2.0]; |
|
859 5 [fillcolor="#9999FF", |
847 5 [fillcolor="#9999FF", |
860 fixedsize=true, |
848 fixedsize=true, |
861 group=default, |
849 group=default, |
862 height=0.5, |
850 height=0.5, |
863 label=5, |
851 label=5, |
864 pin=true, |
852 pin=true, |
865 pos="1,5!", |
853 pos="1,5!", |
866 shape=circle, |
854 shape=circle, |
867 style=filled, |
855 style=filled, |
868 width=0.5]; |
856 width=0.5]; |
869 4 -> 5 [arrowhead=none, |
857 0 -> 5 [arrowhead=none, |
870 penwidth=2.0]; |
858 penwidth=2.0]; |
871 6 [fillcolor="#9999FF", |
859 6 [fillcolor="#9999FF", |
872 fixedsize=true, |
860 fixedsize=true, |
873 group=default, |
861 group=default, |
874 height=0.5, |
862 height=0.5, |
878 shape=circle, |
866 shape=circle, |
879 style=filled, |
867 style=filled, |
880 width=0.5]; |
868 width=0.5]; |
881 5 -> 6 [arrowhead=none, |
869 5 -> 6 [arrowhead=none, |
882 penwidth=2.0]; |
870 penwidth=2.0]; |
883 10 [fillcolor="#9999FF", |
871 7 [fillcolor="#9999FF", |
884 fixedsize=true, |
872 fixedsize=true, |
885 group=default, |
873 group=default, |
886 height=0.5, |
874 height=0.5, |
887 label=10, |
875 label=7, |
888 pin=true, |
876 pin=true, |
889 pos="1,10!", |
877 pos="1,7!", |
890 shape=circle, |
878 shape=circle, |
891 style=filled, |
879 style=filled, |
892 width=0.5]; |
880 width=0.5]; |
893 6 -> 10 [arrowhead=none, |
881 6 -> 7 [arrowhead=none, |
894 penwidth=2.0]; |
882 penwidth=2.0]; |
895 11 [fillcolor="#9999FF", |
883 11 [fillcolor="#9999FF", |
896 fixedsize=true, |
884 fixedsize=true, |
897 group=default, |
885 group=default, |
898 height=0.5, |
886 height=0.5, |
899 label=11, |
887 label=11, |
900 pin=true, |
888 pin=true, |
901 pos="1,11!", |
889 pos="1,11!", |
902 shape=pentagon, |
890 shape=circle, |
903 style=filled, |
891 style=filled, |
904 width=0.5]; |
892 width=0.5]; |
905 10 -> 11 [arrowhead=none, |
893 7 -> 11 [arrowhead=none, |
|
894 penwidth=2.0]; |
|
895 12 [fillcolor="#9999FF", |
|
896 fixedsize=true, |
|
897 group=default, |
|
898 height=0.5, |
|
899 label=12, |
|
900 pin=true, |
|
901 pos="1,12!", |
|
902 shape=pentagon, |
|
903 style=filled, |
|
904 width=0.5]; |
|
905 11 -> 12 [arrowhead=none, |
906 penwidth=2.0]; |
906 penwidth=2.0]; |
907 } |
907 } |
908 #endif |
908 #endif |
909 |
909 |
910 Splitting change |
910 Splitting change |
1133 pin=true, |
1133 pin=true, |
1134 pos="1,0!", |
1134 pos="1,0!", |
1135 shape=circle, |
1135 shape=circle, |
1136 style=filled, |
1136 style=filled, |
1137 width=0.5]; |
1137 width=0.5]; |
1138 4 [fillcolor="#9999FF", |
|
1139 fixedsize=true, |
|
1140 group=default, |
|
1141 height=0.5, |
|
1142 label=4, |
|
1143 pin=true, |
|
1144 pos="1,4!", |
|
1145 shape=circle, |
|
1146 style=filled, |
|
1147 width=0.5]; |
|
1148 0 -> 4 [arrowhead=none, |
|
1149 penwidth=2.0]; |
|
1150 5 [fillcolor="#9999FF", |
1138 5 [fillcolor="#9999FF", |
1151 fixedsize=true, |
1139 fixedsize=true, |
1152 group=default, |
1140 group=default, |
1153 height=0.5, |
1141 height=0.5, |
1154 label=5, |
1142 label=5, |
1155 pin=true, |
1143 pin=true, |
1156 pos="1,5!", |
1144 pos="1,5!", |
1157 shape=circle, |
1145 shape=circle, |
1158 style=filled, |
1146 style=filled, |
1159 width=0.5]; |
1147 width=0.5]; |
1160 4 -> 5 [arrowhead=none, |
1148 0 -> 5 [arrowhead=none, |
1161 penwidth=2.0]; |
1149 penwidth=2.0]; |
1162 6 [fillcolor="#9999FF", |
1150 6 [fillcolor="#9999FF", |
1163 fixedsize=true, |
1151 fixedsize=true, |
1164 group=default, |
1152 group=default, |
1165 height=0.5, |
1153 height=0.5, |
1169 shape=circle, |
1157 shape=circle, |
1170 style=filled, |
1158 style=filled, |
1171 width=0.5]; |
1159 width=0.5]; |
1172 5 -> 6 [arrowhead=none, |
1160 5 -> 6 [arrowhead=none, |
1173 penwidth=2.0]; |
1161 penwidth=2.0]; |
1174 10 [fillcolor="#9999FF", |
1162 7 [fillcolor="#9999FF", |
1175 fixedsize=true, |
1163 fixedsize=true, |
1176 group=default, |
1164 group=default, |
1177 height=0.5, |
1165 height=0.5, |
1178 label=10, |
1166 label=7, |
1179 pin=true, |
1167 pin=true, |
1180 pos="1,10!", |
1168 pos="1,7!", |
1181 shape=circle, |
1169 shape=circle, |
1182 style=filled, |
1170 style=filled, |
1183 width=0.5]; |
1171 width=0.5]; |
1184 6 -> 10 [arrowhead=none, |
1172 6 -> 7 [arrowhead=none, |
1185 penwidth=2.0]; |
1173 penwidth=2.0]; |
1186 12 [fillcolor="#9999FF", |
1174 11 [fillcolor="#9999FF", |
1187 fixedsize=true, |
1175 fixedsize=true, |
1188 group=default, |
1176 group=default, |
1189 height=0.5, |
1177 height=0.5, |
1190 label=12, |
1178 label=11, |
1191 pin=true, |
1179 pin=true, |
1192 pos="1,12!", |
1180 pos="1,11!", |
1193 shape=pentagon, |
1181 shape=circle, |
1194 style=filled, |
1182 style=filled, |
1195 width=0.5]; |
1183 width=0.5]; |
1196 10 -> 12 [arrowhead=none, |
1184 7 -> 11 [arrowhead=none, |
|
1185 penwidth=2.0]; |
|
1186 14 [fillcolor="#9999FF", |
|
1187 fixedsize=true, |
|
1188 group=default, |
|
1189 height=0.5, |
|
1190 label=14, |
|
1191 pin=true, |
|
1192 pos="1,14!", |
|
1193 shape=pentagon, |
|
1194 style=filled, |
|
1195 width=0.5]; |
|
1196 11 -> 14 [arrowhead=none, |
1197 penwidth=2.0]; |
1197 penwidth=2.0]; |
1198 } |
1198 } |
1199 #endif |
1199 #endif |
1200 |
1200 |
1201 When we pull from remote again we get an unstable state! |
1201 When we pull from remote again we get an unstable state! |
1204 pulling from $TESTTMP/remote (glob) |
1204 pulling from $TESTTMP/remote (glob) |
1205 searching for changes |
1205 searching for changes |
1206 adding changesets |
1206 adding changesets |
1207 adding manifests |
1207 adding manifests |
1208 adding file changes |
1208 adding file changes |
1209 added 1 changesets with 1 changes to 1 files |
1209 added 1 changesets with 1 changes to 1 files (+1 heads) |
1210 (run 'hg update' to get a working copy) |
1210 (run 'hg heads' to see heads, 'hg merge' to merge) |
1211 1 new orphan changesets |
1211 1 new orphan changesets |
1212 |
1212 |
1213 |
1213 |
1214 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1214 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1215 see both version showing up in the log. |
1215 see both version showing up in the log. |
1249 pin=true, |
1249 pin=true, |
1250 pos="1,0!", |
1250 pos="1,0!", |
1251 shape=circle, |
1251 shape=circle, |
1252 style=filled, |
1252 style=filled, |
1253 width=0.5]; |
1253 width=0.5]; |
1254 4 [fillcolor="#9999FF", |
|
1255 fixedsize=true, |
|
1256 group=default, |
|
1257 height=0.5, |
|
1258 label=4, |
|
1259 pin=true, |
|
1260 pos="1,4!", |
|
1261 shape=circle, |
|
1262 style=filled, |
|
1263 width=0.5]; |
|
1264 0 -> 4 [arrowhead=none, |
|
1265 penwidth=2.0]; |
|
1266 5 [fillcolor="#9999FF", |
1254 5 [fillcolor="#9999FF", |
1267 fixedsize=true, |
1255 fixedsize=true, |
1268 group=default, |
1256 group=default, |
1269 height=0.5, |
1257 height=0.5, |
1270 label=5, |
1258 label=5, |
1271 pin=true, |
1259 pin=true, |
1272 pos="1,5!", |
1260 pos="1,5!", |
1273 shape=circle, |
1261 shape=circle, |
1274 style=filled, |
1262 style=filled, |
1275 width=0.5]; |
1263 width=0.5]; |
1276 4 -> 5 [arrowhead=none, |
1264 0 -> 5 [arrowhead=none, |
1277 penwidth=2.0]; |
1265 penwidth=2.0]; |
1278 6 [fillcolor="#9999FF", |
1266 6 [fillcolor="#9999FF", |
1279 fixedsize=true, |
1267 fixedsize=true, |
1280 group=default, |
1268 group=default, |
1281 height=0.5, |
1269 height=0.5, |
1285 shape=circle, |
1273 shape=circle, |
1286 style=filled, |
1274 style=filled, |
1287 width=0.5]; |
1275 width=0.5]; |
1288 5 -> 6 [arrowhead=none, |
1276 5 -> 6 [arrowhead=none, |
1289 penwidth=2.0]; |
1277 penwidth=2.0]; |
1290 10 [fillcolor="#9999FF", |
1278 7 [fillcolor="#9999FF", |
1291 fixedsize=true, |
1279 fixedsize=true, |
1292 group=default, |
1280 group=default, |
1293 height=0.5, |
1281 height=0.5, |
1294 label=10, |
1282 label=7, |
1295 pin=true, |
1283 pin=true, |
1296 pos="1,10!", |
1284 pos="1,7!", |
1297 shape=circle, |
1285 shape=circle, |
1298 style=filled, |
1286 style=filled, |
1299 width=0.5]; |
1287 width=0.5]; |
1300 6 -> 10 [arrowhead=none, |
1288 6 -> 7 [arrowhead=none, |
1301 penwidth=2.0]; |
1289 penwidth=2.0]; |
1302 11 [fillcolor="#DFDFFF", |
1290 11 [fillcolor="#9999FF", |
|
1291 fixedsize=true, |
|
1292 group=default, |
|
1293 height=0.5, |
|
1294 label=11, |
|
1295 pin=true, |
|
1296 pos="1,11!", |
|
1297 shape=circle, |
|
1298 style=filled, |
|
1299 width=0.5]; |
|
1300 7 -> 11 [arrowhead=none, |
|
1301 penwidth=2.0]; |
|
1302 12 [fillcolor="#DFDFFF", |
1303 fixedsize=true, |
1303 fixedsize=true, |
1304 group=default_alt, |
1304 group=default_alt, |
1305 height=0.5, |
1305 height=0.5, |
1306 label=11, |
1306 label=12, |
1307 pin=true, |
1307 pin=true, |
1308 pos="2,11!", |
1308 pos="2,12!", |
1309 shape=pentagon, |
1309 shape=pentagon, |
1310 style="dotted, filled", |
1310 style="dotted, filled", |
1311 width=0.5]; |
1311 width=0.5]; |
1312 10 -> 11 [arrowhead=none, |
|
1313 penwidth=2.0]; |
|
1314 12 [fillcolor="#9999FF", |
|
1315 fixedsize=true, |
|
1316 group=default, |
|
1317 height=0.5, |
|
1318 label=12, |
|
1319 pin=true, |
|
1320 pos="1,12!", |
|
1321 shape=pentagon, |
|
1322 style=filled, |
|
1323 width=0.5]; |
|
1324 10 -> 12 [arrowhead=none, |
|
1325 penwidth=2.0]; |
|
1326 11 -> 12 [arrowhead=none, |
1312 11 -> 12 [arrowhead=none, |
|
1313 penwidth=2.0]; |
|
1314 14 [fillcolor="#9999FF", |
|
1315 fixedsize=true, |
|
1316 group=default, |
|
1317 height=0.5, |
|
1318 label=14, |
|
1319 pin=true, |
|
1320 pos="1,14!", |
|
1321 shape=pentagon, |
|
1322 style=filled, |
|
1323 width=0.5]; |
|
1324 11 -> 14 [arrowhead=none, |
|
1325 penwidth=2.0]; |
|
1326 12 -> 14 [arrowhead=none, |
1327 minlen=0, |
1327 minlen=0, |
1328 penwidth=2.0, |
1328 penwidth=2.0, |
1329 style=dashed]; |
1329 style=dashed]; |
1330 13 [fillcolor="#FF4F4F", |
1330 15 [fillcolor="#FF4F4F", |
1331 fixedsize=true, |
1331 fixedsize=true, |
1332 group=default_alt, |
1332 group=default_alt, |
1333 height=0.5, |
1333 height=0.5, |
1334 label=13, |
1334 label=15, |
1335 pin=true, |
1335 pin=true, |
1336 pos="2,13!", |
1336 pos="2,15!", |
1337 shape=pentagon, |
1337 shape=pentagon, |
1338 style=filled, |
1338 style=filled, |
1339 width=0.5]; |
1339 width=0.5]; |
1340 11 -> 13 [arrowhead=none, |
1340 12 -> 15 [arrowhead=none, |
1341 penwidth=2.0]; |
1341 penwidth=2.0]; |
1342 } |
1342 } |
1343 #endif |
1343 #endif |
1344 |
1344 |
1345 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 |
1362 a44c85f957d3. The `hg evolve` command will do this for you. |
1362 a44c85f957d3. The `hg evolve` command will do this for you. |
1363 |
1363 |
1364 It has a --dry-run option to only suggest the next move. |
1364 It has a --dry-run option to only suggest the next move. |
1365 |
1365 |
1366 $ hg evolve --dry-run |
1366 $ hg evolve --dry-run |
1367 move:[13] animals |
1367 move:[15] animals |
1368 atop:[12] bathroom stuff |
1368 atop:[14] bathroom stuff |
1369 hg rebase -r bf1b0d202029 -d a44c85f957d3 |
1369 hg rebase -r bf1b0d202029 -d a44c85f957d3 |
1370 |
1370 |
1371 Let's do it |
1371 Let's do it |
1372 |
1372 |
1373 $ hg evolve |
1373 $ hg evolve |
1374 move:[13] animals |
1374 move:[15] animals |
1375 atop:[12] bathroom stuff |
1375 atop:[14] bathroom stuff |
1376 merging shopping |
1376 merging shopping |
1377 working directory is now at ee942144f952 |
1377 working directory is now at ee942144f952 |
1378 |
1378 |
1379 The old version of bathroom is hidden again. |
1379 The old version of bathroom is hidden again. |
1380 |
1380 |
1411 pin=true, |
1411 pin=true, |
1412 pos="1,0!", |
1412 pos="1,0!", |
1413 shape=circle, |
1413 shape=circle, |
1414 style=filled, |
1414 style=filled, |
1415 width=0.5]; |
1415 width=0.5]; |
1416 4 [fillcolor="#9999FF", |
|
1417 fixedsize=true, |
|
1418 group=default, |
|
1419 height=0.5, |
|
1420 label=4, |
|
1421 pin=true, |
|
1422 pos="1,4!", |
|
1423 shape=circle, |
|
1424 style=filled, |
|
1425 width=0.5]; |
|
1426 0 -> 4 [arrowhead=none, |
|
1427 penwidth=2.0]; |
|
1428 5 [fillcolor="#9999FF", |
1416 5 [fillcolor="#9999FF", |
1429 fixedsize=true, |
1417 fixedsize=true, |
1430 group=default, |
1418 group=default, |
1431 height=0.5, |
1419 height=0.5, |
1432 label=5, |
1420 label=5, |
1433 pin=true, |
1421 pin=true, |
1434 pos="1,5!", |
1422 pos="1,5!", |
1435 shape=circle, |
1423 shape=circle, |
1436 style=filled, |
1424 style=filled, |
1437 width=0.5]; |
1425 width=0.5]; |
1438 4 -> 5 [arrowhead=none, |
1426 0 -> 5 [arrowhead=none, |
1439 penwidth=2.0]; |
1427 penwidth=2.0]; |
1440 6 [fillcolor="#9999FF", |
1428 6 [fillcolor="#9999FF", |
1441 fixedsize=true, |
1429 fixedsize=true, |
1442 group=default, |
1430 group=default, |
1443 height=0.5, |
1431 height=0.5, |
1447 shape=circle, |
1435 shape=circle, |
1448 style=filled, |
1436 style=filled, |
1449 width=0.5]; |
1437 width=0.5]; |
1450 5 -> 6 [arrowhead=none, |
1438 5 -> 6 [arrowhead=none, |
1451 penwidth=2.0]; |
1439 penwidth=2.0]; |
1452 10 [fillcolor="#9999FF", |
1440 7 [fillcolor="#9999FF", |
1453 fixedsize=true, |
1441 fixedsize=true, |
1454 group=default, |
1442 group=default, |
1455 height=0.5, |
1443 height=0.5, |
1456 label=10, |
1444 label=7, |
1457 pin=true, |
1445 pin=true, |
1458 pos="1,10!", |
1446 pos="1,7!", |
1459 shape=circle, |
1447 shape=circle, |
1460 style=filled, |
1448 style=filled, |
1461 width=0.5]; |
1449 width=0.5]; |
1462 6 -> 10 [arrowhead=none, |
1450 6 -> 7 [arrowhead=none, |
1463 penwidth=2.0]; |
1451 penwidth=2.0]; |
1464 12 [fillcolor="#9999FF", |
1452 11 [fillcolor="#9999FF", |
1465 fixedsize=true, |
1453 fixedsize=true, |
1466 group=default, |
1454 group=default, |
1467 height=0.5, |
1455 height=0.5, |
1468 label=12, |
1456 label=11, |
1469 pin=true, |
1457 pin=true, |
1470 pos="1,12!", |
1458 pos="1,11!", |
1471 shape=pentagon, |
1459 shape=circle, |
1472 style=filled, |
1460 style=filled, |
1473 width=0.5]; |
1461 width=0.5]; |
1474 10 -> 12 [arrowhead=none, |
1462 7 -> 11 [arrowhead=none, |
1475 penwidth=2.0]; |
1463 penwidth=2.0]; |
1476 14 [fillcolor="#9999FF", |
1464 14 [fillcolor="#9999FF", |
1477 fixedsize=true, |
1465 fixedsize=true, |
1478 group=default, |
1466 group=default, |
1479 height=0.5, |
1467 height=0.5, |
1495 searching for changes |
1495 searching for changes |
1496 adding changesets |
1496 adding changesets |
1497 adding manifests |
1497 adding manifests |
1498 adding file changes |
1498 adding file changes |
1499 added 2 changesets with 2 changes to 1 files (+1 heads) |
1499 added 2 changesets with 2 changes to 1 files (+1 heads) |
1500 2 new obsolescence markers |
1500 3 new obsolescence markers |
1501 obsoleted 2 changesets |
1501 obsoleted 2 changesets |
1502 |
1502 |
1503 Remote get a warning that current working directory is based on an obsolete |
1503 Remote get a warning that current working directory is based on an obsolete |
1504 changeset. |
1504 changeset. |
1505 |
1505 |
1576 pin=true, |
1576 pin=true, |
1577 pos="1,0!", |
1577 pos="1,0!", |
1578 shape=circle, |
1578 shape=circle, |
1579 style=filled, |
1579 style=filled, |
1580 width=0.5]; |
1580 width=0.5]; |
1581 4 [fillcolor="#9999FF", |
|
1582 fixedsize=true, |
|
1583 group=default, |
|
1584 height=0.5, |
|
1585 label=4, |
|
1586 pin=true, |
|
1587 pos="1,4!", |
|
1588 shape=circle, |
|
1589 style=filled, |
|
1590 width=0.5]; |
|
1591 0 -> 4 [arrowhead=none, |
|
1592 penwidth=2.0]; |
|
1593 5 [fillcolor="#9999FF", |
1581 5 [fillcolor="#9999FF", |
1594 fixedsize=true, |
1582 fixedsize=true, |
1595 group=default, |
1583 group=default, |
1596 height=0.5, |
1584 height=0.5, |
1597 label=5, |
1585 label=5, |
1598 pin=true, |
1586 pin=true, |
1599 pos="1,5!", |
1587 pos="1,5!", |
1600 shape=circle, |
1588 shape=circle, |
1601 style=filled, |
1589 style=filled, |
1602 width=0.5]; |
1590 width=0.5]; |
1603 4 -> 5 [arrowhead=none, |
1591 0 -> 5 [arrowhead=none, |
1604 penwidth=2.0]; |
1592 penwidth=2.0]; |
1605 6 [fillcolor="#9999FF", |
1593 6 [fillcolor="#9999FF", |
1606 fixedsize=true, |
1594 fixedsize=true, |
1607 group=default, |
1595 group=default, |
1608 height=0.5, |
1596 height=0.5, |
1612 shape=circle, |
1600 shape=circle, |
1613 style=filled, |
1601 style=filled, |
1614 width=0.5]; |
1602 width=0.5]; |
1615 5 -> 6 [arrowhead=none, |
1603 5 -> 6 [arrowhead=none, |
1616 penwidth=2.0]; |
1604 penwidth=2.0]; |
1617 10 [fillcolor="#9999FF", |
1605 7 [fillcolor="#9999FF", |
1618 fixedsize=true, |
1606 fixedsize=true, |
1619 group=default, |
1607 group=default, |
1620 height=0.5, |
1608 height=0.5, |
1621 label=10, |
1609 label=7, |
1622 pin=true, |
1610 pin=true, |
1623 pos="1,10!", |
1611 pos="1,7!", |
1624 shape=circle, |
1612 shape=circle, |
1625 style=filled, |
1613 style=filled, |
1626 width=0.5]; |
1614 width=0.5]; |
1627 6 -> 10 [arrowhead=none, |
1615 6 -> 7 [arrowhead=none, |
1628 penwidth=2.0]; |
1616 penwidth=2.0]; |
1629 12 [fillcolor="#9999FF", |
1617 11 [fillcolor="#9999FF", |
1630 fixedsize=true, |
1618 fixedsize=true, |
1631 group=default, |
1619 group=default, |
1632 height=0.5, |
1620 height=0.5, |
1633 label=12, |
1621 label=11, |
1634 pin=true, |
1622 pin=true, |
1635 pos="1,12!", |
1623 pos="1,11!", |
1636 shape=pentagon, |
1624 shape=circle, |
1637 style=filled, |
1625 style=filled, |
1638 width=0.5]; |
1626 width=0.5]; |
1639 10 -> 12 [arrowhead=none, |
1627 7 -> 11 [arrowhead=none, |
1640 penwidth=2.0]; |
1628 penwidth=2.0]; |
1641 14 [fillcolor="#9999FF", |
1629 14 [fillcolor="#9999FF", |
1642 fixedsize=true, |
1630 fixedsize=true, |
1643 group=default, |
1631 group=default, |
1644 height=0.5, |
1632 height=0.5, |
1646 pin=true, |
1634 pin=true, |
1647 pos="1,14!", |
1635 pos="1,14!", |
1648 shape=pentagon, |
1636 shape=pentagon, |
1649 style=filled, |
1637 style=filled, |
1650 width=0.5]; |
1638 width=0.5]; |
1651 12 -> 14 [arrowhead=none, |
1639 11 -> 14 [arrowhead=none, |
1652 penwidth=2.0]; |
1640 penwidth=2.0]; |
1653 15 [fillcolor="#9999FF", |
1641 16 [fillcolor="#9999FF", |
1654 fixedsize=true, |
1642 fixedsize=true, |
1655 group=default, |
1643 group=default, |
1656 height=0.5, |
1644 height=0.5, |
1657 label=15, |
1645 label=16, |
1658 pin=true, |
1646 pin=true, |
1659 pos="1,15!", |
1647 pos="1,16!", |
1660 shape=pentagon, |
1648 shape=pentagon, |
1661 style=filled, |
1649 style=filled, |
1662 width=0.5]; |
1650 width=0.5]; |
1663 14 -> 15 [arrowhead=none, |
1651 14 -> 16 [arrowhead=none, |
|
1652 penwidth=2.0]; |
|
1653 17 [fillcolor="#9999FF", |
|
1654 fixedsize=true, |
|
1655 group=default, |
|
1656 height=0.5, |
|
1657 label=17, |
|
1658 pin=true, |
|
1659 pos="1,17!", |
|
1660 shape=pentagon, |
|
1661 style=filled, |
|
1662 width=0.5]; |
|
1663 16 -> 17 [arrowhead=none, |
1664 penwidth=2.0]; |
1664 penwidth=2.0]; |
1665 } |
1665 } |
1666 #endif |
1666 #endif |
1667 |
1667 |
1668 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: |
1712 pin=true, |
1712 pin=true, |
1713 pos="1,0!", |
1713 pos="1,0!", |
1714 shape=circle, |
1714 shape=circle, |
1715 style=filled, |
1715 style=filled, |
1716 width=0.5]; |
1716 width=0.5]; |
1717 4 [fillcolor="#9999FF", |
|
1718 fixedsize=true, |
|
1719 group=default, |
|
1720 height=0.5, |
|
1721 label=4, |
|
1722 pin=true, |
|
1723 pos="1,4!", |
|
1724 shape=circle, |
|
1725 style=filled, |
|
1726 width=0.5]; |
|
1727 0 -> 4 [arrowhead=none, |
|
1728 penwidth=2.0]; |
|
1729 5 [fillcolor="#9999FF", |
1717 5 [fillcolor="#9999FF", |
1730 fixedsize=true, |
1718 fixedsize=true, |
1731 group=default, |
1719 group=default, |
1732 height=0.5, |
1720 height=0.5, |
1733 label=5, |
1721 label=5, |
1734 pin=true, |
1722 pin=true, |
1735 pos="1,5!", |
1723 pos="1,5!", |
1736 shape=circle, |
1724 shape=circle, |
1737 style=filled, |
1725 style=filled, |
1738 width=0.5]; |
1726 width=0.5]; |
1739 4 -> 5 [arrowhead=none, |
1727 0 -> 5 [arrowhead=none, |
1740 penwidth=2.0]; |
1728 penwidth=2.0]; |
1741 6 [fillcolor="#9999FF", |
1729 6 [fillcolor="#9999FF", |
1742 fixedsize=true, |
1730 fixedsize=true, |
1743 group=default, |
1731 group=default, |
1744 height=0.5, |
1732 height=0.5, |
1748 shape=circle, |
1736 shape=circle, |
1749 style=filled, |
1737 style=filled, |
1750 width=0.5]; |
1738 width=0.5]; |
1751 5 -> 6 [arrowhead=none, |
1739 5 -> 6 [arrowhead=none, |
1752 penwidth=2.0]; |
1740 penwidth=2.0]; |
1753 10 [fillcolor="#9999FF", |
1741 7 [fillcolor="#9999FF", |
1754 fixedsize=true, |
1742 fixedsize=true, |
1755 group=default, |
1743 group=default, |
1756 height=0.5, |
1744 height=0.5, |
1757 label=10, |
1745 label=7, |
1758 pin=true, |
1746 pin=true, |
1759 pos="1,10!", |
1747 pos="1,7!", |
1760 shape=circle, |
1748 shape=circle, |
1761 style=filled, |
1749 style=filled, |
1762 width=0.5]; |
1750 width=0.5]; |
1763 6 -> 10 [arrowhead=none, |
1751 6 -> 7 [arrowhead=none, |
1764 penwidth=2.0]; |
1752 penwidth=2.0]; |
1765 12 [fillcolor="#9999FF", |
1753 11 [fillcolor="#9999FF", |
1766 fixedsize=true, |
1754 fixedsize=true, |
1767 group=default, |
1755 group=default, |
1768 height=0.5, |
1756 height=0.5, |
1769 label=12, |
1757 label=11, |
1770 pin=true, |
1758 pin=true, |
1771 pos="1,12!", |
1759 pos="1,11!", |
1772 shape=pentagon, |
1760 shape=circle, |
1773 style=filled, |
1761 style=filled, |
1774 width=0.5]; |
1762 width=0.5]; |
1775 10 -> 12 [arrowhead=none, |
1763 7 -> 11 [arrowhead=none, |
1776 penwidth=2.0]; |
1764 penwidth=2.0]; |
1777 14 [fillcolor="#DFDFFF", |
1765 14 [fillcolor="#9999FF", |
|
1766 fixedsize=true, |
|
1767 group=default, |
|
1768 height=0.5, |
|
1769 label=14, |
|
1770 pin=true, |
|
1771 pos="1,14!", |
|
1772 shape=pentagon, |
|
1773 style=filled, |
|
1774 width=0.5]; |
|
1775 11 -> 14 [arrowhead=none, |
|
1776 penwidth=2.0]; |
|
1777 16 [fillcolor="#DFDFFF", |
1778 fixedsize=true, |
1778 fixedsize=true, |
1779 group=default_alt, |
1779 group=default_alt, |
1780 height=0.5, |
1780 height=0.5, |
1781 label=14, |
1781 label=16, |
1782 pin=true, |
1782 pin=true, |
1783 pos="2,14!", |
1783 pos="2,16!", |
1784 shape=pentagon, |
1784 shape=pentagon, |
1785 style="dotted, filled", |
1785 style="dotted, filled", |
1786 width=0.5]; |
1786 width=0.5]; |
1787 12 -> 14 [arrowhead=none, |
1787 14 -> 16 [arrowhead=none, |
1788 penwidth=2.0]; |
1788 penwidth=2.0]; |
1789 15 [fillcolor="#FF4F4F", |
1789 17 [fillcolor="#FF4F4F", |
1790 fixedsize=true, |
1790 fixedsize=true, |
1791 group=default_alt, |
1791 group=default_alt, |
1792 height=0.5, |
1792 height=0.5, |
1793 label=15, |
1793 label=17, |
1794 pin=true, |
1794 pin=true, |
1795 pos="2,15!", |
1795 pos="2,17!", |
1796 shape=pentagon, |
1796 shape=pentagon, |
1797 style=filled, |
1797 style=filled, |
1798 width=0.5]; |
1798 width=0.5]; |
1799 14 -> 15 [arrowhead=none, |
1799 16 -> 17 [arrowhead=none, |
1800 penwidth=2.0]; |
1800 penwidth=2.0]; |
1801 } |
1801 } |
1802 #endif |
1802 #endif |
1803 |
1803 |
1804 $ hg log -r "orphan()" |
1804 $ hg log -r "orphan()" |
1811 strict digraph { |
1811 strict digraph { |
1812 graph [rankdir=LR, |
1812 graph [rankdir=LR, |
1813 splines=polyline |
1813 splines=polyline |
1814 ]; |
1814 ]; |
1815 node [label="\N"]; |
1815 node [label="\N"]; |
1816 15 [fillcolor="#FF4F4F", |
1816 17 [fillcolor="#FF4F4F", |
1817 fixedsize=true, |
1817 fixedsize=true, |
1818 group=default_alt, |
1818 group=default_alt, |
1819 height=0.5, |
1819 height=0.5, |
1820 label=15, |
1820 label=17, |
1821 pin=true, |
1821 pin=true, |
1822 pos="1,15!", |
1822 pos="1,17!", |
1823 shape=pentagon, |
1823 shape=pentagon, |
1824 style=filled, |
1824 style=filled, |
1825 width=0.5]; |
1825 width=0.5]; |
1826 } |
1826 } |
1827 #endif |
1827 #endif |
1828 |
1828 |
1829 $ hg evolve |
1829 $ hg evolve |
1830 move:[15] SPAM SPAM SPAM |
1830 move:[17] SPAM SPAM SPAM |
1831 atop:[12] bathroom stuff |
1831 atop:[14] bathroom stuff |
1832 merging shopping |
1832 merging shopping |
1833 working directory is now at 40aa40daeefb |
1833 working directory is now at 40aa40daeefb |
1834 |
1834 |
1835 $ hg log -G |
1835 $ hg log -G |
1836 @ 40aa40daeefb (draft): SPAM SPAM SPAM |
1836 @ 40aa40daeefb (draft): SPAM SPAM SPAM |
1865 pin=true, |
1865 pin=true, |
1866 pos="1,0!", |
1866 pos="1,0!", |
1867 shape=circle, |
1867 shape=circle, |
1868 style=filled, |
1868 style=filled, |
1869 width=0.5]; |
1869 width=0.5]; |
1870 4 [fillcolor="#9999FF", |
|
1871 fixedsize=true, |
|
1872 group=default, |
|
1873 height=0.5, |
|
1874 label=4, |
|
1875 pin=true, |
|
1876 pos="1,4!", |
|
1877 shape=circle, |
|
1878 style=filled, |
|
1879 width=0.5]; |
|
1880 0 -> 4 [arrowhead=none, |
|
1881 penwidth=2.0]; |
|
1882 5 [fillcolor="#9999FF", |
1870 5 [fillcolor="#9999FF", |
1883 fixedsize=true, |
1871 fixedsize=true, |
1884 group=default, |
1872 group=default, |
1885 height=0.5, |
1873 height=0.5, |
1886 label=5, |
1874 label=5, |
1887 pin=true, |
1875 pin=true, |
1888 pos="1,5!", |
1876 pos="1,5!", |
1889 shape=circle, |
1877 shape=circle, |
1890 style=filled, |
1878 style=filled, |
1891 width=0.5]; |
1879 width=0.5]; |
1892 4 -> 5 [arrowhead=none, |
1880 0 -> 5 [arrowhead=none, |
1893 penwidth=2.0]; |
1881 penwidth=2.0]; |
1894 6 [fillcolor="#9999FF", |
1882 6 [fillcolor="#9999FF", |
1895 fixedsize=true, |
1883 fixedsize=true, |
1896 group=default, |
1884 group=default, |
1897 height=0.5, |
1885 height=0.5, |
1901 shape=circle, |
1889 shape=circle, |
1902 style=filled, |
1890 style=filled, |
1903 width=0.5]; |
1891 width=0.5]; |
1904 5 -> 6 [arrowhead=none, |
1892 5 -> 6 [arrowhead=none, |
1905 penwidth=2.0]; |
1893 penwidth=2.0]; |
1906 10 [fillcolor="#9999FF", |
1894 7 [fillcolor="#9999FF", |
1907 fixedsize=true, |
1895 fixedsize=true, |
1908 group=default, |
1896 group=default, |
1909 height=0.5, |
1897 height=0.5, |
1910 label=10, |
1898 label=7, |
1911 pin=true, |
1899 pin=true, |
1912 pos="1,10!", |
1900 pos="1,7!", |
1913 shape=circle, |
1901 shape=circle, |
1914 style=filled, |
1902 style=filled, |
1915 width=0.5]; |
1903 width=0.5]; |
1916 6 -> 10 [arrowhead=none, |
1904 6 -> 7 [arrowhead=none, |
1917 penwidth=2.0]; |
1905 penwidth=2.0]; |
1918 12 [fillcolor="#9999FF", |
1906 11 [fillcolor="#9999FF", |
1919 fixedsize=true, |
1907 fixedsize=true, |
1920 group=default, |
1908 group=default, |
1921 height=0.5, |
1909 height=0.5, |
1922 label=12, |
1910 label=11, |
1923 pin=true, |
1911 pin=true, |
1924 pos="1,12!", |
1912 pos="1,11!", |
1925 shape=pentagon, |
1913 shape=circle, |
1926 style=filled, |
1914 style=filled, |
1927 width=0.5]; |
1915 width=0.5]; |
1928 10 -> 12 [arrowhead=none, |
1916 7 -> 11 [arrowhead=none, |
1929 penwidth=2.0]; |
1917 penwidth=2.0]; |
1930 16 [fillcolor="#9999FF", |
1918 14 [fillcolor="#9999FF", |
1931 fixedsize=true, |
1919 fixedsize=true, |
1932 group=default, |
1920 group=default, |
1933 height=0.5, |
1921 height=0.5, |
1934 label=16, |
1922 label=14, |
1935 pin=true, |
1923 pin=true, |
1936 pos="1,16!", |
1924 pos="1,14!", |
1937 shape=pentagon, |
1925 shape=pentagon, |
1938 style=filled, |
1926 style=filled, |
1939 width=0.5]; |
1927 width=0.5]; |
1940 12 -> 16 [arrowhead=none, |
1928 11 -> 14 [arrowhead=none, |
|
1929 penwidth=2.0]; |
|
1930 18 [fillcolor="#9999FF", |
|
1931 fixedsize=true, |
|
1932 group=default, |
|
1933 height=0.5, |
|
1934 label=18, |
|
1935 pin=true, |
|
1936 pos="1,18!", |
|
1937 shape=pentagon, |
|
1938 style=filled, |
|
1939 width=0.5]; |
|
1940 14 -> 18 [arrowhead=none, |
1941 penwidth=2.0]; |
1941 penwidth=2.0]; |
1942 } |
1942 } |
1943 #endif |
1943 #endif |
1944 |
1944 |
1945 Handling Divergent amend |
1945 Handling Divergent amend |