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