Mercurial > evolve

comparison tests/test-tutorial.t @ 3936:537fd9a86c06 mercurial-4.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.4 into mercurial-4.3
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 03 Aug 2018 00:22:50 +0200
parents 98941c28f3e2
children 7a5c3175015e 9c025ec4af88
comparison
equal deleted inserted replaced
3935:9af0e2b0bdd7 3936:537fd9a86c06
309 shape=pentagon, 309 shape=pentagon,
310 style=filled, 310 style=filled,
311 width=1]; 311 width=1];
312 0 -> 1 [arrowhead=none, 312 0 -> 1 [arrowhead=none,
313 penwidth=2.0]; 313 penwidth=2.0];
314 3 [fillcolor="#7F7FFF", 314 4 [fillcolor="#9999FF",
315 fixedsize=true, 315 fixedsize=true,
316 group=default, 316 group=default,
317 height=1, 317 height=1,
318 label=3, 318 label=3,
319 pin=true, 319 pin=true,
320 pos="1,3!", 320 pos="1,4!",
321 shape=pentagon, 321 shape=pentagon,
322 style=filled, 322 style=filled,
323 width=1];
324 1 -> 3 [arrowhead=none,
325 penwidth=2.0]; 323 penwidth=2.0];
326 } 324 }
327 #endif 325 #endif
328 326
329 $ hg export tip 327 $ hg export tip
364 searching for changes 362 searching for changes
365 adding changesets 363 adding changesets
366 adding manifests 364 adding manifests
367 adding file changes 365 adding file changes
368 added 1 changesets with 1 changes to 1 files (+1 heads) 366 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) 367 (run 'hg heads' to see heads, 'hg merge' to merge)
371 368
372 I now have a new head. Note that this remote head is immutable. 369 I now have a new head. Note that this remote head is immutable.
373 370
374 $ hg log -G 371 $ hg log -G
410 shape=pentagon, 407 shape=pentagon,
411 style=filled, 408 style=filled,
412 width=1]; 409 width=1];
413 0 -> 1 [arrowhead=none, 410 0 -> 1 [arrowhead=none,
414 penwidth=2.0]; 411 penwidth=2.0];
415 4 [fillcolor="#7F7FFF",
416 fixedsize=true, 412 fixedsize=true,
417 group=default, 413 group=default,
418 height=1, 414 height=1,
419 label=4, 415 label=4,
420 pin=true, 416 pin=true,
421 pos="1,4!", 417 pos="1,4!",
422 shape=circle,
423 style=filled,
424 width=1];
425 0 -> 4 [arrowhead=none,
426 penwidth=2.0];
427 3 [fillcolor="#7F7FFF",
428 fixedsize=true,
429 group=default,
430 height=1,
431 label=3,
432 pin=true,
433 pos="1,3!",
434 shape=pentagon,
435 style=filled,
436 width=1];
437 1 -> 3 [arrowhead=none,
438 penwidth=2.0]; 418 penwidth=2.0];
439 } 419 }
440 #endif 420 #endif
441 421
442 Instead of merging my head with the new one. I'm going to rebase my work 422 Instead of merging my head with the new one. I'm going to rebase my work
443 423
444 $ hg diff 424 $ hg diff
445 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 425 $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
446 rebasing 1:4d5dc8187023 "adding condiment" 426 rebasing 1:4d5dc8187023 "adding condiment"
447 merging shopping 427 merging shopping
448 rebasing 3:9d0363b81950 "adding fruit" 428 rebasing 4:9d0363b81950 "adding fruit"
449 merging shopping 429 merging shopping
450 430
451 431
452 My local work is now rebased on the remote one. 432 My local work is now rebased on the remote one.
453 433
476 label=0, 456 label=0,
477 pin=true, 457 pin=true,
478 pos="1,0!", 458 pos="1,0!",
479 shape=circle, 459 shape=circle,
480 style=filled, 460 style=filled,
481 width=1];
482 4 [fillcolor="#7F7FFF",
483 fixedsize=true,
484 group=default,
485 height=1,
486 label=4,
487 pin=true,
488 pos="1,4!",
489 shape=circle,
490 style=filled,
491 width=1];
492 0 -> 4 [arrowhead=none,
493 penwidth=2.0];
494 5 [fillcolor="#7F7FFF",
495 fixedsize=true, 461 fixedsize=true,
496 group=default, 462 group=default,
497 height=1, 463 height=1,
498 label=5, 464 label=5,
499 pin=true, 465 pin=true,
500 pos="1,5!", 466 pos="1,5!",
501 shape=pentagon, 467 shape=circle,
502 style=filled, 468 style=filled,
503 width=1];
504 4 -> 5 [arrowhead=none,
505 penwidth=2.0]; 469 penwidth=2.0];
506 6 [fillcolor="#7F7FFF", 470 6 [fillcolor="#7F7FFF",
507 fixedsize=true, 471 fixedsize=true,
508 group=default, 472 group=default,
509 height=1, 473 height=1,
512 pos="1,6!", 476 pos="1,6!",
513 shape=pentagon, 477 shape=pentagon,
514 style=filled, 478 style=filled,
515 width=1]; 479 width=1];
516 5 -> 6 [arrowhead=none, 480 5 -> 6 [arrowhead=none,
481 penwidth=2.0];
482 7 [fillcolor="#9999FF",
483 fixedsize=true,
484 group=default,
485 height=0.5,
486 label=7,
487 pin=true,
488 pos="1,7!",
489 shape=pentagon,
490 style=filled,
491 width=0.5];
492 6 -> 7 [arrowhead=none,
517 penwidth=2.0]; 493 penwidth=2.0];
518 } 494 }
519 #endif 495 #endif
520 496
521 Removing changesets 497 Removing changesets
578 label=0, 554 label=0,
579 pin=true, 555 pin=true,
580 pos="1,0!", 556 pos="1,0!",
581 shape=circle, 557 shape=circle,
582 style=filled, 558 style=filled,
583 width=1];
584 4 [fillcolor="#7F7FFF",
585 fixedsize=true,
586 group=default,
587 height=1,
588 label=4,
589 pin=true,
590 pos="1,4!",
591 shape=circle,
592 style=filled,
593 width=1];
594 0 -> 4 [arrowhead=none,
595 penwidth=2.0];
596 5 [fillcolor="#7F7FFF",
597 fixedsize=true, 559 fixedsize=true,
598 group=default, 560 group=default,
599 height=1, 561 height=1,
600 label=5, 562 label=5,
601 pin=true, 563 pin=true,
602 pos="1,5!", 564 pos="1,5!",
603 shape=pentagon, 565 shape=circle,
604 style=filled, 566 style=filled,
605 width=1];
606 4 -> 5 [arrowhead=none,
607 penwidth=2.0]; 567 penwidth=2.0];
608 6 [fillcolor="#7F7FFF", 568 6 [fillcolor="#7F7FFF",
609 fixedsize=true, 569 fixedsize=true,
610 group=default, 570 group=default,
611 height=1, 571 height=1,
614 pos="1,6!", 574 pos="1,6!",
615 shape=pentagon, 575 shape=pentagon,
616 style=filled, 576 style=filled,
617 width=1]; 577 width=1];
618 5 -> 6 [arrowhead=none, 578 5 -> 6 [arrowhead=none,
579 penwidth=2.0];
580 7 [fillcolor="#9999FF",
581 fixedsize=true,
582 group=default,
583 height=0.5,
584 label=7,
585 pin=true,
586 pos="1,7!",
587 shape=pentagon,
588 style=filled,
589 width=0.5];
590 6 -> 7 [arrowhead=none,
619 penwidth=2.0]; 591 penwidth=2.0];
620 } 592 }
621 #endif 593 #endif
622 594
623 Reordering changesets 595 Reordering changesets
663 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>` 635 .. note: grab is an alias for `hg rebase --dest . --rev <target>; hg up <there>`
664 636
665 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 637 $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
666 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 638 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
667 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent 639 $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
668 grabbing 9:fac207dec9f5 "SPAM SPAM" 640 grabbing 10:fac207dec9f5 "SPAM SPAM"
669 merging shopping 641 merging shopping
670 $ hg log -G 642 $ hg log -G
671 @ 57e9caedbcb8 (draft): SPAM SPAM 643 @ 57e9caedbcb8 (draft): SPAM SPAM
672 | 644 |
673 | o 10b8aeaa8cc8 (draft): bathroom stuff 645 | o 10b8aeaa8cc8 (draft): bathroom stuff
697 label=0, 669 label=0,
698 pin=true, 670 pin=true,
699 pos="1,0!", 671 pos="1,0!",
700 shape=circle, 672 shape=circle,
701 style=filled, 673 style=filled,
702 width=1];
703 4 [fillcolor="#7F7FFF",
704 fixedsize=true,
705 group=default,
706 height=1,
707 label=4,
708 pin=true,
709 pos="1,4!",
710 shape=circle,
711 style=filled,
712 width=1];
713 0 -> 4 [arrowhead=none,
714 penwidth=2.0];
715 5 [fillcolor="#7F7FFF",
716 fixedsize=true, 674 fixedsize=true,
717 group=default, 675 group=default,
718 height=1, 676 height=1,
719 label=5, 677 label=5,
720 pin=true, 678 pin=true,
721 pos="1,5!", 679 pos="1,5!",
722 shape=pentagon, 680 shape=circle,
723 style=filled, 681 style=filled,
724 width=1];
725 4 -> 5 [arrowhead=none,
726 penwidth=2.0]; 682 penwidth=2.0];
727 6 [fillcolor="#7F7FFF", 683 6 [fillcolor="#7F7FFF",
728 fixedsize=true, 684 fixedsize=true,
729 group=default, 685 group=default,
730 height=1, 686 height=1,
734 shape=pentagon, 690 shape=pentagon,
735 style=filled, 691 style=filled,
736 width=1]; 692 width=1];
737 5 -> 6 [arrowhead=none, 693 5 -> 6 [arrowhead=none,
738 penwidth=2.0]; 694 penwidth=2.0];
739 8 [fillcolor="#7F7FFF", 695 height=0.5,
740 fixedsize=true,
741 group=default,
742 height=1,
743 label=8,
744 pin=true,
745 pos="1,8!",
746 shape=pentagon,
747 style=filled,
748 width=1];
749 6 -> 8 [arrowhead=none,
750 penwidth=2.0];
751 10 [fillcolor="#7F7FFF",
752 fixedsize=true,
753 group=default,
754 height=1,
755 label=10,
756 pin=true,
757 pos="1,10!",
758 shape=pentagon,
759 style=filled,
760 width=1];
761 6 -> 10 [arrowhead=none,
762 penwidth=2.0]; 696 penwidth=2.0];
763 } 697 }
764 #endif 698 #endif
765 699
766 We have a new SPAM SPAM version without the bathroom stuff 700 We have a new SPAM SPAM version without the bathroom stuff
800 searching for changes 734 searching for changes
801 adding changesets 735 adding changesets
802 adding manifests 736 adding manifests
803 adding file changes 737 adding file changes
804 added 3 changesets with 3 changes to 1 files 738 added 3 changesets with 3 changes to 1 files
805 5 new obsolescence markers 739 6 new obsolescence markers
806 740
807 for simplicity sake we get the bathroom change in line again 741 for simplicity sake we get the bathroom change in line again
808 742
809 $ hg grab 10b8aeaa8cc8 743 $ hg grab 10b8aeaa8cc8
810 grabbing 8:10b8aeaa8cc8 "bathroom stuff" 744 grabbing 9:10b8aeaa8cc8 "bathroom stuff"
811 merging shopping 745 merging shopping
812 $ hg phase --draft . 746 $ hg phase --draft .
813 $ hg log -G 747 $ hg log -G
814 @ 4710c0968793 (draft): bathroom stuff 748 @ 4710c0968793 (draft): bathroom stuff
815 | 749 |
840 label=0, 774 label=0,
841 pin=true, 775 pin=true,
842 pos="1,0!", 776 pos="1,0!",
843 shape=circle, 777 shape=circle,
844 style=filled, 778 style=filled,
845 width=1];
846 4 [fillcolor="#7F7FFF",
847 fixedsize=true,
848 group=default,
849 height=1,
850 label=4,
851 pin=true,
852 pos="1,4!",
853 shape=circle,
854 style=filled,
855 width=1];
856 0 -> 4 [arrowhead=none,
857 penwidth=2.0];
858 5 [fillcolor="#7F7FFF",
859 fixedsize=true,
860 group=default,
861 height=1,
862 label=5,
863 pin=true,
864 pos="1,5!",
865 shape=circle,
866 style=filled,
867 width=1];
868 4 -> 5 [arrowhead=none,
869 penwidth=2.0];
870 6 [fillcolor="#7F7FFF",
871 fixedsize=true,
872 group=default,
873 height=1,
874 label=6,
875 pin=true,
876 pos="1,6!",
877 shape=circle,
878 style=filled,
879 width=1];
880 5 -> 6 [arrowhead=none,
881 penwidth=2.0];
882 10 [fillcolor="#7F7FFF",
883 fixedsize=true,
884 group=default,
885 height=1,
886 label=10,
887 pin=true,
888 pos="1,10!",
889 shape=circle,
890 style=filled,
891 width=1];
892 6 -> 10 [arrowhead=none,
893 penwidth=2.0]; 779 penwidth=2.0];
894 11 [fillcolor="#7F7FFF", 780 11 [fillcolor="#7F7FFF",
895 fixedsize=true, 781 fixedsize=true,
896 group=default, 782 group=default,
897 height=1, 783 height=1,
898 label=11, 784 label=11,
899 pin=true, 785 pin=true,
900 pos="1,11!", 786 pos="1,11!",
901 shape=pentagon, 787 shape=circle,
902 style=filled, 788 style=filled,
903 width=1]; 789 width=0.5];
904 10 -> 11 [arrowhead=none, 790 7 -> 11 [arrowhead=none,
791 penwidth=2.0];
792 12 [fillcolor="#9999FF",
793 fixedsize=true,
794 group=default,
795 height=0.5,
796 label=12,
797 pin=true,
798 pos="1,12!",
799 shape=pentagon,
800 style=filled,
905 penwidth=2.0]; 801 penwidth=2.0];
906 } 802 }
907 #endif 803 #endif
908 804
909 Splitting change 805 Splitting change
1012 adding changesets 908 adding changesets
1013 adding manifests 909 adding manifests
1014 adding file changes 910 adding file changes
1015 added 1 changesets with 1 changes to 1 files 911 added 1 changesets with 1 changes to 1 files
1016 1 new obsolescence markers 912 1 new obsolescence markers
1017 new changesets 4710c0968793
1018 (run 'hg update' to get a working copy) 913 (run 'hg update' to get a working copy)
1019 $ hg log -G 914 $ hg log -G
1020 o 4710c0968793 (public): bathroom stuff 915 o 4710c0968793 (public): bathroom stuff
1021 | 916 |
1022 o 57e9caedbcb8 (public): SPAM SPAM 917 o 57e9caedbcb8 (public): SPAM SPAM
1068 adding changesets 963 adding changesets
1069 adding manifests 964 adding manifests
1070 adding file changes 965 adding file changes
1071 added 1 changesets with 1 changes to 1 files 966 added 1 changesets with 1 changes to 1 files
1072 1 new obsolescence markers 967 1 new obsolescence markers
1073 new changesets 4710c0968793
1074 (run 'hg update' to get a working copy) 968 (run 'hg update' to get a working copy)
1075 $ hg log -G 969 $ hg log -G
1076 o 4710c0968793 (draft): bathroom stuff 970 o 4710c0968793 (draft): bathroom stuff
1077 | 971 |
1078 o 57e9caedbcb8 (public): SPAM SPAM 972 o 57e9caedbcb8 (public): SPAM SPAM
1136 label=0, 1030 label=0,
1137 pin=true, 1031 pin=true,
1138 pos="1,0!", 1032 pos="1,0!",
1139 shape=circle, 1033 shape=circle,
1140 style=filled, 1034 style=filled,
1141 width=1]; 1035 pin=true,
1142 4 [fillcolor="#7F7FFF", 1036 pos="1,11!",
1143 fixedsize=true, 1037 shape=circle,
1144 group=default, 1038 style=filled,
1145 height=1, 1039 width=0.5];
1146 label=4, 1040 7 -> 11 [arrowhead=none,
1147 pin=true, 1041 penwidth=2.0];
1148 pos="1,4!", 1042 14 [fillcolor="#9999FF",
1149 shape=circle, 1043 fixedsize=true,
1150 style=filled, 1044 group=default,
1151 width=1]; 1045 height=0.5,
1152 0 -> 4 [arrowhead=none, 1046 label=14,
1153 penwidth=2.0]; 1047 pin=true,
1154 5 [fillcolor="#7F7FFF", 1048 pos="1,14!",
1155 fixedsize=true, 1049 shape=pentagon,
1156 group=default, 1050 style=filled,
1157 height=1,
1158 label=5,
1159 pin=true,
1160 pos="1,5!",
1161 shape=circle,
1162 style=filled,
1163 width=1];
1164 4 -> 5 [arrowhead=none,
1165 penwidth=2.0];
1166 6 [fillcolor="#7F7FFF",
1167 fixedsize=true,
1168 group=default,
1169 height=1,
1170 label=6,
1171 pin=true,
1172 pos="1,6!",
1173 shape=circle,
1174 style=filled,
1175 width=1];
1176 5 -> 6 [arrowhead=none,
1177 penwidth=2.0];
1178 10 [fillcolor="#7F7FFF",
1179 fixedsize=true,
1180 group=default,
1181 height=1,
1182 label=10,
1183 pin=true,
1184 pos="1,10!",
1185 shape=circle,
1186 style=filled,
1187 width=1];
1188 6 -> 10 [arrowhead=none,
1189 penwidth=2.0];
1190 12 [fillcolor="#7F7FFF",
1191 fixedsize=true,
1192 group=default,
1193 height=1,
1194 label=12,
1195 pin=true,
1196 pos="1,12!",
1197 shape=pentagon,
1198 style=filled,
1199 width=1];
1200 10 -> 12 [arrowhead=none,
1201 penwidth=2.0]; 1051 penwidth=2.0];
1202 } 1052 }
1203 #endif 1053 #endif
1204 1054
1205 When we pull from remote again we get an unstable state! 1055 When we pull from remote again we get an unstable state!
1208 pulling from $TESTTMP/remote (glob) 1058 pulling from $TESTTMP/remote (glob)
1209 searching for changes 1059 searching for changes
1210 adding changesets 1060 adding changesets
1211 adding manifests 1061 adding manifests
1212 adding file changes 1062 adding file changes
1213 added 1 changesets with 1 changes to 1 files 1063 added 1 changesets with 1 changes to 1 files (+1 heads)
1214 new changesets e4e4fa805d92 1064 (run 'hg heads' to see heads, 'hg merge' to merge)
1215 (run 'hg update' to get a working copy) 1065 1 new unstable changesets
1216 1 new orphan changesets
1217 1066
1218 The new changeset "animal" is based on an old changeset of "bathroom". You can 1067 The new changeset "animal" is based on an old changeset of "bathroom". You can
1219 see both version showing up in the log. 1068 see both version showing up in the log.
1220 1069
1221 $ hg log -G 1070 $ hg log -G
1252 label=0, 1101 label=0,
1253 pin=true, 1102 pin=true,
1254 pos="1,0!", 1103 pos="1,0!",
1255 shape=circle, 1104 shape=circle,
1256 style=filled, 1105 style=filled,
1257 width=1];
1258 4 [fillcolor="#7F7FFF",
1259 fixedsize=true,
1260 group=default,
1261 height=1,
1262 label=4,
1263 pin=true,
1264 pos="1,4!",
1265 shape=circle,
1266 style=filled,
1267 width=1];
1268 0 -> 4 [arrowhead=none,
1269 penwidth=2.0];
1270 5 [fillcolor="#7F7FFF",
1271 fixedsize=true,
1272 group=default,
1273 height=1,
1274 label=5,
1275 pin=true,
1276 pos="1,5!",
1277 shape=circle,
1278 style=filled,
1279 width=1];
1280 4 -> 5 [arrowhead=none,
1281 penwidth=2.0];
1282 6 [fillcolor="#7F7FFF",
1283 fixedsize=true,
1284 group=default,
1285 height=1,
1286 label=6,
1287 pin=true,
1288 pos="1,6!",
1289 shape=circle,
1290 style=filled,
1291 width=1];
1292 5 -> 6 [arrowhead=none,
1293 penwidth=2.0];
1294 10 [fillcolor="#7F7FFF",
1295 fixedsize=true,
1296 group=default,
1297 height=1,
1298 label=10,
1299 pin=true,
1300 pos="1,10!",
1301 shape=circle,
1302 style=filled,
1303 width=1];
1304 6 -> 10 [arrowhead=none,
1305 penwidth=2.0];
1306 11 [fillcolor="#DFDFFF",
1307 fixedsize=true,
1308 group=default_alt,
1309 height=1,
1310 label=11,
1311 pin=true,
1312 pos="2,11!",
1313 shape=pentagon,
1314 style="dotted, filled",
1315 width=1];
1316 10 -> 11 [arrowhead=none,
1317 penwidth=2.0];
1318 12 [fillcolor="#7F7FFF",
1319 fixedsize=true,
1320 group=default,
1321 height=1,
1322 label=12,
1323 pin=true,
1324 pos="1,12!",
1325 shape=pentagon,
1326 style=filled,
1327 width=1];
1328 10 -> 12 [arrowhead=none,
1329 penwidth=2.0];
1330 11 -> 12 [arrowtail=none,
1331 dir=back,
1332 minlen=0,
1333 penwidth=2.0,
1334 style=dashed];
1335 13 [fillcolor="#FF4F4F",
1336 fixedsize=true,
1337 group=default_alt,
1338 height=1,
1339 label=13,
1340 pin=true,
1341 pos="2,13!",
1342 shape=pentagon,
1343 style=filled,
1344 width=1];
1345 11 -> 13 [arrowhead=none,
1346 penwidth=2.0]; 1106 penwidth=2.0];
1347 } 1107 }
1348 #endif 1108 #endif
1349 1109
1350 The older version 75954b8cd933 never ceased to exist in the local repo. It was 1110 The older version 75954b8cd933 never ceased to exist in the local repo. It was
1356 share it with the outside: 1116 share it with the outside:
1357 1117
1358 $ hg push other 1118 $ hg push other
1359 pushing to $TESTTMP/other (glob) 1119 pushing to $TESTTMP/other (glob)
1360 searching for changes 1120 searching for changes
1361 abort: push includes orphan changeset: e4e4fa805d92! 1121 abort: push includes unstable changeset: e4e4fa805d92!
1362 (use 'hg evolve' to get a stable history or --force to ignore warnings) 1122 (use 'hg evolve' to get a stable history or --force to ignore warnings)
1363 [255] 1123 [255]
1364 1124
1365 1125
1366 To resolve this unstable state, you need to rebase bf1b0d202029 onto 1126 To resolve this unstable state, you need to rebase bf1b0d202029 onto
1367 a44c85f957d3. The `hg evolve` command will do this for you. 1127 a44c85f957d3. The `hg evolve` command will do this for you.
1368 1128
1369 It has a --dry-run option to only suggest the next move. 1129 It has a --dry-run option to only suggest the next move.
1370 1130
1371 $ hg evolve --dry-run 1131 $ hg evolve --dry-run
1372 move:[13] animals 1132 move:[15] animals
1373 atop:[12] bathroom stuff 1133 atop:[14] bathroom stuff
1374 hg rebase -r e4e4fa805d92 -d 682004e81e71 1134 hg rebase -r e4e4fa805d92 -d 682004e81e71
1375 1135
1376 Let's do it 1136 Let's do it
1377 1137
1378 $ hg evolve 1138 $ hg evolve
1379 move:[13] animals 1139 move:[15] animals
1380 atop:[12] bathroom stuff 1140 atop:[14] bathroom stuff
1381 merging shopping 1141 merging shopping
1382 working directory is now at 2a2b36e14660 1142 working directory is now at 2a2b36e14660
1383 1143
1384 The old version of bathroom is hidden again. 1144 The old version of bathroom is hidden again.
1385 1145
1415 label=0, 1175 label=0,
1416 pin=true, 1176 pin=true,
1417 pos="1,0!", 1177 pos="1,0!",
1418 shape=circle, 1178 shape=circle,
1419 style=filled, 1179 style=filled,
1420 width=1];
1421 4 [fillcolor="#7F7FFF",
1422 fixedsize=true,
1423 group=default,
1424 height=1,
1425 label=4,
1426 pin=true,
1427 pos="1,4!",
1428 shape=circle,
1429 style=filled,
1430 width=1];
1431 0 -> 4 [arrowhead=none,
1432 penwidth=2.0];
1433 5 [fillcolor="#7F7FFF",
1434 fixedsize=true,
1435 group=default,
1436 height=1,
1437 label=5,
1438 pin=true,
1439 pos="1,5!",
1440 shape=circle,
1441 style=filled,
1442 width=1];
1443 4 -> 5 [arrowhead=none,
1444 penwidth=2.0]; 1180 penwidth=2.0];
1445 6 [fillcolor="#7F7FFF", 1181 6 [fillcolor="#7F7FFF",
1446 fixedsize=true, 1182 fixedsize=true,
1447 group=default, 1183 group=default,
1448 height=1, 1184 height=1,
1452 shape=circle, 1188 shape=circle,
1453 style=filled, 1189 style=filled,
1454 width=1]; 1190 width=1];
1455 5 -> 6 [arrowhead=none, 1191 5 -> 6 [arrowhead=none,
1456 penwidth=2.0]; 1192 penwidth=2.0];
1457 10 [fillcolor="#7F7FFF",
1458 fixedsize=true,
1459 group=default,
1460 height=1,
1461 label=10,
1462 pin=true,
1463 pos="1,10!",
1464 shape=circle,
1465 style=filled,
1466 width=1];
1467 6 -> 10 [arrowhead=none,
1468 penwidth=2.0];
1469 12 [fillcolor="#7F7FFF",
1470 fixedsize=true,
1471 group=default,
1472 height=1,
1473 label=12,
1474 pin=true,
1475 pos="1,12!",
1476 shape=pentagon,
1477 style=filled,
1478 width=1];
1479 10 -> 12 [arrowhead=none,
1480 penwidth=2.0];
1481 14 [fillcolor="#7F7FFF",
1482 fixedsize=true,
1483 group=default,
1484 height=1,
1485 label=14,
1486 pin=true,
1487 pos="1,14!",
1488 shape=pentagon,
1489 style=filled,
1490 width=1];
1491 12 -> 14 [arrowhead=none,
1492 penwidth=2.0]; 1193 penwidth=2.0];
1493 } 1194 }
1494 #endif 1195 #endif
1495 1196
1496 We can push this evolution to remote. 1197 We can push this evolution to remote.
1500 searching for changes 1201 searching for changes
1501 adding changesets 1202 adding changesets
1502 adding manifests 1203 adding manifests
1503 adding file changes 1204 adding file changes
1504 added 2 changesets with 2 changes to 1 files (+1 heads) 1205 added 2 changesets with 2 changes to 1 files (+1 heads)
1505 2 new obsolescence markers 1206 3 new obsolescence markers
1506 obsoleted 2 changesets 1207 obsoleted 2 changesets
1507 1208
1508 Remote get a warning that current working directory is based on an obsolete 1209 Remote get a warning that current working directory is based on an obsolete
1509 changeset. 1210 changeset.
1510 1211
1541 searching for changes 1242 searching for changes
1542 adding changesets 1243 adding changesets
1543 adding manifests 1244 adding manifests
1544 adding file changes 1245 adding file changes
1545 added 1 changesets with 1 changes to 1 files 1246 added 1 changesets with 1 changes to 1 files
1546 new changesets fc41faf45288
1547 (run 'hg update' to get a working copy) 1247 (run 'hg update' to get a working copy)
1548 $ hg log -G 1248 $ hg log -G
1549 o fc41faf45288 (draft): SPAM SPAM SPAM 1249 o fc41faf45288 (draft): SPAM SPAM SPAM
1550 | 1250 |
1551 @ 2a2b36e14660 (draft): animals 1251 @ 2a2b36e14660 (draft): animals
1579 label=0, 1279 label=0,
1580 pin=true, 1280 pin=true,
1581 pos="1,0!", 1281 pos="1,0!",
1582 shape=circle, 1282 shape=circle,
1583 style=filled, 1283 style=filled,
1584 width=1];
1585 4 [fillcolor="#7F7FFF",
1586 fixedsize=true,
1587 group=default,
1588 height=1,
1589 label=4,
1590 pin=true,
1591 pos="1,4!",
1592 shape=circle,
1593 style=filled,
1594 width=1];
1595 0 -> 4 [arrowhead=none,
1596 penwidth=2.0];
1597 5 [fillcolor="#7F7FFF",
1598 fixedsize=true, 1284 fixedsize=true,
1599 group=default, 1285 group=default,
1600 height=1, 1286 height=1,
1601 label=5, 1287 label=5,
1602 pin=true, 1288 pin=true,
1603 pos="1,5!", 1289 pos="1,5!",
1604 shape=circle, 1290 shape=circle,
1605 style=filled, 1291 style=filled,
1606 width=1];
1607 4 -> 5 [arrowhead=none,
1608 penwidth=2.0]; 1292 penwidth=2.0];
1609 6 [fillcolor="#7F7FFF", 1293 6 [fillcolor="#7F7FFF",
1610 fixedsize=true, 1294 fixedsize=true,
1611 group=default, 1295 group=default,
1612 height=1, 1296 height=1,
1616 shape=circle, 1300 shape=circle,
1617 style=filled, 1301 style=filled,
1618 width=1]; 1302 width=1];
1619 5 -> 6 [arrowhead=none, 1303 5 -> 6 [arrowhead=none,
1620 penwidth=2.0]; 1304 penwidth=2.0];
1621 10 [fillcolor="#7F7FFF", 1305 fixedsize=true,
1622 fixedsize=true, 1306 group=default,
1623 group=default, 1307 pin=true,
1624 height=1, 1308 pos="1,7!",
1625 label=10, 1309 shape=circle,
1626 pin=true, 1310 style=filled,
1627 pos="1,10!", 1311 penwidth=2.0];
1628 shape=circle, 1312 fixedsize=true,
1629 style=filled, 1313 group=default,
1630 width=1]; 1314 pin=true,
1631 6 -> 10 [arrowhead=none, 1315 pos="1,11!",
1632 penwidth=2.0]; 1316 shape=circle,
1633 12 [fillcolor="#7F7FFF", 1317 style=filled,
1634 fixedsize=true,
1635 group=default,
1636 height=1,
1637 label=12,
1638 pin=true,
1639 pos="1,12!",
1640 shape=pentagon,
1641 style=filled,
1642 width=1];
1643 10 -> 12 [arrowhead=none,
1644 penwidth=2.0]; 1318 penwidth=2.0];
1645 14 [fillcolor="#7F7FFF", 1319 14 [fillcolor="#7F7FFF",
1646 fixedsize=true, 1320 fixedsize=true,
1647 group=default, 1321 group=default,
1648 height=1, 1322 height=1,
1649 label=14, 1323 label=14,
1650 pin=true, 1324 pin=true,
1651 pos="1,14!", 1325 pos="1,14!",
1652 shape=pentagon, 1326 shape=pentagon,
1653 style=filled, 1327 style=filled,
1654 width=1]; 1328 penwidth=2.0];
1655 12 -> 14 [arrowhead=none, 1329 fixedsize=true,
1656 penwidth=2.0]; 1330 group=default,
1657 15 [fillcolor="#7F7FFF", 1331 pin=true,
1658 fixedsize=true, 1332 pos="1,16!",
1659 group=default, 1333 shape=pentagon,
1660 height=1, 1334 style=filled,
1661 label=15,
1662 pin=true,
1663 pos="1,15!",
1664 shape=pentagon,
1665 style=filled,
1666 width=1];
1667 14 -> 15 [arrowhead=none,
1668 penwidth=2.0]; 1335 penwidth=2.0];
1669 } 1336 }
1670 #endif 1337 #endif
1671 1338
1672 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: 1339 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset:
1673 1340
1674 $ hg prune 2a2b36e14660 1341 $ hg prune 2a2b36e14660
1675 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1342 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1676 working directory now at 682004e81e71 1343 working directory now at 682004e81e71
1677 1 changesets pruned 1344 1 changesets pruned
1678 1 new orphan changesets 1345 1 new unstable changesets
1679 1346
1680 1347
1681 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset 1348 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
1682 is neither dead or obsolete. My repository is in an unstable state again. 1349 is neither dead or obsolete. My repository is in an unstable state again.
1683 1350
1715 label=0, 1382 label=0,
1716 pin=true, 1383 pin=true,
1717 pos="1,0!", 1384 pos="1,0!",
1718 shape=circle, 1385 shape=circle,
1719 style=filled, 1386 style=filled,
1720 width=1];
1721 4 [fillcolor="#7F7FFF",
1722 fixedsize=true,
1723 group=default,
1724 height=1,
1725 label=4,
1726 pin=true,
1727 pos="1,4!",
1728 shape=circle,
1729 style=filled,
1730 width=1];
1731 0 -> 4 [arrowhead=none,
1732 penwidth=2.0];
1733 5 [fillcolor="#7F7FFF",
1734 fixedsize=true, 1387 fixedsize=true,
1735 group=default, 1388 group=default,
1736 height=1, 1389 height=1,
1737 label=5, 1390 label=5,
1738 pin=true, 1391 pin=true,
1739 pos="1,5!", 1392 pos="1,5!",
1740 shape=circle, 1393 shape=circle,
1741 style=filled, 1394 style=filled,
1742 width=1];
1743 4 -> 5 [arrowhead=none,
1744 penwidth=2.0]; 1395 penwidth=2.0];
1745 6 [fillcolor="#7F7FFF", 1396 6 [fillcolor="#7F7FFF",
1746 fixedsize=true, 1397 fixedsize=true,
1747 group=default, 1398 group=default,
1748 height=1, 1399 height=1,
1752 shape=circle, 1403 shape=circle,
1753 style=filled, 1404 style=filled,
1754 width=1]; 1405 width=1];
1755 5 -> 6 [arrowhead=none, 1406 5 -> 6 [arrowhead=none,
1756 penwidth=2.0]; 1407 penwidth=2.0];
1757 10 [fillcolor="#7F7FFF", 1408 fixedsize=true,
1758 fixedsize=true, 1409 group=default,
1759 group=default, 1410 pin=true,
1760 height=1, 1411 pos="1,7!",
1761 label=10, 1412 shape=circle,
1762 pin=true, 1413 style=filled,
1763 pos="1,10!", 1414 penwidth=2.0];
1764 shape=circle, 1415 fixedsize=true,
1765 style=filled, 1416 group=default,
1766 width=1]; 1417 pin=true,
1767 6 -> 10 [arrowhead=none, 1418 pos="1,11!",
1768 penwidth=2.0]; 1419 shape=circle,
1769 12 [fillcolor="#7F7FFF", 1420 style=filled,
1770 fixedsize=true, 1421 width=0.5];
1771 group=default, 1422 7 -> 11 [arrowhead=none,
1772 height=1, 1423 penwidth=2.0];
1773 label=12, 1424 14 [fillcolor="#9999FF",
1774 pin=true, 1425 fixedsize=true,
1775 pos="1,12!", 1426 group=default,
1776 shape=pentagon, 1427 height=0.5,
1777 style=filled, 1428 label=14,
1778 width=1]; 1429 pin=true,
1779 10 -> 12 [arrowhead=none, 1430 pos="1,14!",
1780 penwidth=2.0]; 1431 shape=pentagon,
1781 14 [fillcolor="#DFDFFF", 1432 style=filled,
1433 penwidth=2.0];
1434 16 [fillcolor="#DFDFFF",
1782 fixedsize=true, 1435 fixedsize=true,
1783 group=default_alt, 1436 group=default_alt,
1784 height=1, 1437 pin=true,
1785 label=14, 1438 pos="2,16!",
1786 pin=true,
1787 pos="2,14!",
1788 shape=pentagon, 1439 shape=pentagon,
1789 style="dotted, filled", 1440 style="dotted, filled",
1790 width=1]; 1441 penwidth=2.0];
1791 12 -> 14 [arrowhead=none, 1442 17 [fillcolor="#FF4F4F",
1792 penwidth=2.0];
1793 15 [fillcolor="#FF4F4F",
1794 fixedsize=true, 1443 fixedsize=true,
1795 group=default_alt, 1444 group=default_alt,
1796 height=1, 1445 pin=true,
1797 label=15, 1446 pos="2,17!",
1798 pin=true, 1447 shape=pentagon,
1799 pos="2,15!", 1448 style=filled,
1800 shape=pentagon,
1801 style=filled,
1802 width=1];
1803 14 -> 15 [arrowhead=none,
1804 penwidth=2.0]; 1449 penwidth=2.0];
1805 } 1450 }
1806 #endif 1451 #endif
1807 1452
1808 $ hg log -r "orphan()" 1453 $ hg log -r "orphan()"
1815 strict digraph "Mercurial graph" { 1460 strict digraph "Mercurial graph" {
1816 graph [rankdir=LR, 1461 graph [rankdir=LR,
1817 splines=polyline 1462 splines=polyline
1818 ]; 1463 ];
1819 node [label="\N"]; 1464 node [label="\N"];
1820 15 [fillcolor="#FF4F4F", 1465 17 [fillcolor="#FF4F4F",
1821 fixedsize=true, 1466 fixedsize=true,
1822 group=default_alt, 1467 group=default_alt,
1823 height=1, 1468 pin=true,
1824 label=15, 1469 pos="1,17!",
1825 pin=true,
1826 pos="1,15!",
1827 shape=pentagon, 1470 shape=pentagon,
1828 style=filled, 1471 style=filled,
1829 width=1]; 1472 width=1];
1830 } 1473 }
1831 #endif 1474 #endif
1832 1475
1833 $ hg evolve 1476 $ hg evolve
1834 move:[15] SPAM SPAM SPAM 1477 move:[17] SPAM SPAM SPAM
1835 atop:[12] bathroom stuff 1478 atop:[14] bathroom stuff
1836 merging shopping 1479 merging shopping
1837 working directory is now at e6cfcb672150 1480 working directory is now at e6cfcb672150
1838 1481
1839 $ hg log -G 1482 $ hg log -G
1840 @ e6cfcb672150 (draft): SPAM SPAM SPAM 1483 @ e6cfcb672150 (draft): SPAM SPAM SPAM
1868 label=0, 1511 label=0,
1869 pin=true, 1512 pin=true,
1870 pos="1,0!", 1513 pos="1,0!",
1871 shape=circle, 1514 shape=circle,
1872 style=filled, 1515 style=filled,
1873 width=1];
1874 4 [fillcolor="#7F7FFF",
1875 fixedsize=true,
1876 group=default,
1877 height=1,
1878 label=4,
1879 pin=true,
1880 pos="1,4!",
1881 shape=circle,
1882 style=filled,
1883 width=1];
1884 0 -> 4 [arrowhead=none,
1885 penwidth=2.0];
1886 5 [fillcolor="#7F7FFF",
1887 fixedsize=true, 1516 fixedsize=true,
1888 group=default, 1517 group=default,
1889 height=1, 1518 height=1,
1890 label=5, 1519 label=5,
1891 pin=true, 1520 pin=true,
1892 pos="1,5!", 1521 pos="1,5!",
1893 shape=circle, 1522 shape=circle,
1894 style=filled, 1523 style=filled,
1895 width=1];
1896 4 -> 5 [arrowhead=none,
1897 penwidth=2.0]; 1524 penwidth=2.0];
1898 6 [fillcolor="#7F7FFF", 1525 6 [fillcolor="#7F7FFF",
1899 fixedsize=true, 1526 fixedsize=true,
1900 group=default, 1527 group=default,
1901 height=1, 1528 height=1,
1905 shape=circle, 1532 shape=circle,
1906 style=filled, 1533 style=filled,
1907 width=1]; 1534 width=1];
1908 5 -> 6 [arrowhead=none, 1535 5 -> 6 [arrowhead=none,
1909 penwidth=2.0]; 1536 penwidth=2.0];
1910 10 [fillcolor="#7F7FFF", 1537 fixedsize=true,
1911 fixedsize=true, 1538 group=default,
1912 group=default, 1539 pin=true,
1913 height=1, 1540 pos="1,7!",
1914 label=10, 1541 shape=circle,
1915 pin=true, 1542 style=filled,
1916 pos="1,10!", 1543 penwidth=2.0];
1917 shape=circle, 1544 fixedsize=true,
1918 style=filled, 1545 group=default,
1919 width=1]; 1546 pin=true,
1920 6 -> 10 [arrowhead=none, 1547 pos="1,11!",
1921 penwidth=2.0]; 1548 shape=circle,
1922 12 [fillcolor="#7F7FFF", 1549 style=filled,
1923 fixedsize=true, 1550 width=0.5];
1924 group=default, 1551 7 -> 11 [arrowhead=none,
1925 height=1, 1552 penwidth=2.0];
1926 label=12, 1553 14 [fillcolor="#9999FF",
1927 pin=true, 1554 fixedsize=true,
1928 pos="1,12!", 1555 group=default,
1929 shape=pentagon, 1556 height=0.5,
1930 style=filled, 1557 label=14,
1931 width=1]; 1558 pin=true,
1932 10 -> 12 [arrowhead=none, 1559 pos="1,14!",
1933 penwidth=2.0]; 1560 shape=pentagon,
1934 16 [fillcolor="#7F7FFF", 1561 style=filled,
1935 fixedsize=true, 1562 penwidth=2.0];
1936 group=default, 1563 fixedsize=true,
1937 height=1, 1564 group=default,
1938 label=16, 1565 pin=true,
1939 pin=true, 1566 pos="1,18!",
1940 pos="1,16!", 1567 shape=pentagon,
1941 shape=pentagon, 1568 style=filled,
1942 style=filled,
1943 width=1];
1944 12 -> 16 [arrowhead=none,
1945 penwidth=2.0]; 1569 penwidth=2.0];
1946 } 1570 }
1947 #endif 1571 #endif
1948 1572
1949 Handling Divergent amend 1573 Handling Divergent amend