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 |
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 rebasing 9:fac207dec9f5 "SPAM SPAM" (tip) |
640 rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) |
669 merging shopping |
641 merging shopping |
670 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
642 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
671 $ hg log -G |
643 $ hg log -G |
672 @ a224f2a4fb9f (draft): SPAM SPAM |
644 @ a224f2a4fb9f (draft): SPAM SPAM |
673 | |
645 | |
735 shape=pentagon, |
691 shape=pentagon, |
736 style=filled, |
692 style=filled, |
737 width=1]; |
693 width=1]; |
738 5 -> 6 [arrowhead=none, |
694 5 -> 6 [arrowhead=none, |
739 penwidth=2.0]; |
695 penwidth=2.0]; |
740 8 [fillcolor="#7F7FFF", |
696 height=0.5, |
741 fixedsize=true, |
|
742 group=default, |
|
743 height=1, |
|
744 label=8, |
|
745 pin=true, |
|
746 pos="1,8!", |
|
747 shape=pentagon, |
|
748 style=filled, |
|
749 width=1]; |
|
750 6 -> 8 [arrowhead=none, |
|
751 penwidth=2.0]; |
|
752 10 [fillcolor="#7F7FFF", |
|
753 fixedsize=true, |
|
754 group=default, |
|
755 height=1, |
|
756 label=10, |
|
757 pin=true, |
|
758 pos="1,10!", |
|
759 shape=pentagon, |
|
760 style=filled, |
|
761 width=1]; |
|
762 6 -> 10 [arrowhead=none, |
|
763 penwidth=2.0]; |
697 penwidth=2.0]; |
764 } |
698 } |
765 #endif |
699 #endif |
766 |
700 |
767 We have a new SPAM SPAM version without the bathroom stuff |
701 We have a new SPAM SPAM version without the bathroom stuff |
801 searching for changes |
735 searching for changes |
802 adding changesets |
736 adding changesets |
803 adding manifests |
737 adding manifests |
804 adding file changes |
738 adding file changes |
805 added 3 changesets with 3 changes to 1 files |
739 added 3 changesets with 3 changes to 1 files |
806 5 new obsolescence markers |
740 6 new obsolescence markers |
807 |
741 |
808 for simplicity sake we get the bathroom change in line again |
742 for simplicity sake we get the bathroom change in line again |
809 |
743 |
810 $ hg grab 10b8aeaa8cc8 |
744 $ hg grab 10b8aeaa8cc8 |
811 rebasing 8:10b8aeaa8cc8 "bathroom stuff" |
745 rebasing 9:10b8aeaa8cc8 "bathroom stuff" |
812 merging shopping |
746 merging shopping |
813 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
747 ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) |
814 $ hg phase --draft . |
748 $ hg phase --draft . |
815 $ hg log -G |
749 $ hg log -G |
816 @ 75954b8cd933 (draft): bathroom stuff |
750 @ 75954b8cd933 (draft): bathroom stuff |
842 label=0, |
776 label=0, |
843 pin=true, |
777 pin=true, |
844 pos="1,0!", |
778 pos="1,0!", |
845 shape=circle, |
779 shape=circle, |
846 style=filled, |
780 style=filled, |
847 width=1]; |
|
848 4 [fillcolor="#7F7FFF", |
|
849 fixedsize=true, |
|
850 group=default, |
|
851 height=1, |
|
852 label=4, |
|
853 pin=true, |
|
854 pos="1,4!", |
|
855 shape=circle, |
|
856 style=filled, |
|
857 width=1]; |
|
858 0 -> 4 [arrowhead=none, |
|
859 penwidth=2.0]; |
|
860 5 [fillcolor="#7F7FFF", |
|
861 fixedsize=true, |
|
862 group=default, |
|
863 height=1, |
|
864 label=5, |
|
865 pin=true, |
|
866 pos="1,5!", |
|
867 shape=circle, |
|
868 style=filled, |
|
869 width=1]; |
|
870 4 -> 5 [arrowhead=none, |
|
871 penwidth=2.0]; |
|
872 6 [fillcolor="#7F7FFF", |
|
873 fixedsize=true, |
|
874 group=default, |
|
875 height=1, |
|
876 label=6, |
|
877 pin=true, |
|
878 pos="1,6!", |
|
879 shape=circle, |
|
880 style=filled, |
|
881 width=1]; |
|
882 5 -> 6 [arrowhead=none, |
|
883 penwidth=2.0]; |
|
884 10 [fillcolor="#7F7FFF", |
|
885 fixedsize=true, |
|
886 group=default, |
|
887 height=1, |
|
888 label=10, |
|
889 pin=true, |
|
890 pos="1,10!", |
|
891 shape=circle, |
|
892 style=filled, |
|
893 width=1]; |
|
894 6 -> 10 [arrowhead=none, |
|
895 penwidth=2.0]; |
781 penwidth=2.0]; |
896 11 [fillcolor="#7F7FFF", |
782 11 [fillcolor="#7F7FFF", |
897 fixedsize=true, |
783 fixedsize=true, |
898 group=default, |
784 group=default, |
899 height=1, |
785 height=1, |
900 label=11, |
786 label=11, |
901 pin=true, |
787 pin=true, |
902 pos="1,11!", |
788 pos="1,11!", |
903 shape=pentagon, |
789 shape=circle, |
904 style=filled, |
790 style=filled, |
905 width=1]; |
791 width=0.5]; |
906 10 -> 11 [arrowhead=none, |
792 7 -> 11 [arrowhead=none, |
|
793 penwidth=2.0]; |
|
794 12 [fillcolor="#9999FF", |
|
795 fixedsize=true, |
|
796 group=default, |
|
797 height=0.5, |
|
798 label=12, |
|
799 pin=true, |
|
800 pos="1,12!", |
|
801 shape=pentagon, |
|
802 style=filled, |
907 penwidth=2.0]; |
803 penwidth=2.0]; |
908 } |
804 } |
909 #endif |
805 #endif |
910 |
806 |
911 Splitting change |
807 Splitting change |
1014 adding changesets |
910 adding changesets |
1015 adding manifests |
911 adding manifests |
1016 adding file changes |
912 adding file changes |
1017 added 1 changesets with 1 changes to 1 files |
913 added 1 changesets with 1 changes to 1 files |
1018 1 new obsolescence markers |
914 1 new obsolescence markers |
1019 new changesets 75954b8cd933 |
|
1020 (run 'hg update' to get a working copy) |
915 (run 'hg update' to get a working copy) |
1021 $ hg log -G |
916 $ hg log -G |
1022 o 75954b8cd933 (public): bathroom stuff |
917 o 75954b8cd933 (public): bathroom stuff |
1023 | |
918 | |
1024 o a224f2a4fb9f (public): SPAM SPAM |
919 o a224f2a4fb9f (public): SPAM SPAM |
1070 adding changesets |
965 adding changesets |
1071 adding manifests |
966 adding manifests |
1072 adding file changes |
967 adding file changes |
1073 added 1 changesets with 1 changes to 1 files |
968 added 1 changesets with 1 changes to 1 files |
1074 1 new obsolescence markers |
969 1 new obsolescence markers |
1075 new changesets 75954b8cd933 |
|
1076 (run 'hg update' to get a working copy) |
970 (run 'hg update' to get a working copy) |
1077 $ hg log -G |
971 $ hg log -G |
1078 o 75954b8cd933 (draft): bathroom stuff |
972 o 75954b8cd933 (draft): bathroom stuff |
1079 | |
973 | |
1080 o a224f2a4fb9f (public): SPAM SPAM |
974 o a224f2a4fb9f (public): SPAM SPAM |
1138 label=0, |
1032 label=0, |
1139 pin=true, |
1033 pin=true, |
1140 pos="1,0!", |
1034 pos="1,0!", |
1141 shape=circle, |
1035 shape=circle, |
1142 style=filled, |
1036 style=filled, |
1143 width=1]; |
1037 pin=true, |
1144 4 [fillcolor="#7F7FFF", |
1038 pos="1,11!", |
1145 fixedsize=true, |
1039 shape=circle, |
1146 group=default, |
1040 style=filled, |
1147 height=1, |
1041 width=0.5]; |
1148 label=4, |
1042 7 -> 11 [arrowhead=none, |
1149 pin=true, |
1043 penwidth=2.0]; |
1150 pos="1,4!", |
1044 14 [fillcolor="#9999FF", |
1151 shape=circle, |
1045 fixedsize=true, |
1152 style=filled, |
1046 group=default, |
1153 width=1]; |
1047 height=0.5, |
1154 0 -> 4 [arrowhead=none, |
1048 label=14, |
1155 penwidth=2.0]; |
1049 pin=true, |
1156 5 [fillcolor="#7F7FFF", |
1050 pos="1,14!", |
1157 fixedsize=true, |
1051 shape=pentagon, |
1158 group=default, |
1052 style=filled, |
1159 height=1, |
|
1160 label=5, |
|
1161 pin=true, |
|
1162 pos="1,5!", |
|
1163 shape=circle, |
|
1164 style=filled, |
|
1165 width=1]; |
|
1166 4 -> 5 [arrowhead=none, |
|
1167 penwidth=2.0]; |
|
1168 6 [fillcolor="#7F7FFF", |
|
1169 fixedsize=true, |
|
1170 group=default, |
|
1171 height=1, |
|
1172 label=6, |
|
1173 pin=true, |
|
1174 pos="1,6!", |
|
1175 shape=circle, |
|
1176 style=filled, |
|
1177 width=1]; |
|
1178 5 -> 6 [arrowhead=none, |
|
1179 penwidth=2.0]; |
|
1180 10 [fillcolor="#7F7FFF", |
|
1181 fixedsize=true, |
|
1182 group=default, |
|
1183 height=1, |
|
1184 label=10, |
|
1185 pin=true, |
|
1186 pos="1,10!", |
|
1187 shape=circle, |
|
1188 style=filled, |
|
1189 width=1]; |
|
1190 6 -> 10 [arrowhead=none, |
|
1191 penwidth=2.0]; |
|
1192 12 [fillcolor="#7F7FFF", |
|
1193 fixedsize=true, |
|
1194 group=default, |
|
1195 height=1, |
|
1196 label=12, |
|
1197 pin=true, |
|
1198 pos="1,12!", |
|
1199 shape=pentagon, |
|
1200 style=filled, |
|
1201 width=1]; |
|
1202 10 -> 12 [arrowhead=none, |
|
1203 penwidth=2.0]; |
1053 penwidth=2.0]; |
1204 } |
1054 } |
1205 #endif |
1055 #endif |
1206 |
1056 |
1207 When we pull from remote again we get an unstable state! |
1057 When we pull from remote again we get an unstable state! |
1210 pulling from $TESTTMP/remote (glob) |
1060 pulling from $TESTTMP/remote (glob) |
1211 searching for changes |
1061 searching for changes |
1212 adding changesets |
1062 adding changesets |
1213 adding manifests |
1063 adding manifests |
1214 adding file changes |
1064 adding file changes |
1215 added 1 changesets with 1 changes to 1 files |
1065 added 1 changesets with 1 changes to 1 files (+1 heads) |
1216 new changesets bf1b0d202029 |
1066 (run 'hg heads' to see heads, 'hg merge' to merge) |
1217 (run 'hg update' to get a working copy) |
1067 1 new unstable changesets |
1218 1 new orphan changesets |
|
1219 |
1068 |
1220 |
1069 |
1221 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1070 The new changeset "animal" is based on an old changeset of "bathroom". You can |
1222 see both version showing up in the log. |
1071 see both version showing up in the log. |
1223 |
1072 |
1255 label=0, |
1104 label=0, |
1256 pin=true, |
1105 pin=true, |
1257 pos="1,0!", |
1106 pos="1,0!", |
1258 shape=circle, |
1107 shape=circle, |
1259 style=filled, |
1108 style=filled, |
1260 width=1]; |
|
1261 4 [fillcolor="#7F7FFF", |
|
1262 fixedsize=true, |
|
1263 group=default, |
|
1264 height=1, |
|
1265 label=4, |
|
1266 pin=true, |
|
1267 pos="1,4!", |
|
1268 shape=circle, |
|
1269 style=filled, |
|
1270 width=1]; |
|
1271 0 -> 4 [arrowhead=none, |
|
1272 penwidth=2.0]; |
|
1273 5 [fillcolor="#7F7FFF", |
|
1274 fixedsize=true, |
|
1275 group=default, |
|
1276 height=1, |
|
1277 label=5, |
|
1278 pin=true, |
|
1279 pos="1,5!", |
|
1280 shape=circle, |
|
1281 style=filled, |
|
1282 width=1]; |
|
1283 4 -> 5 [arrowhead=none, |
|
1284 penwidth=2.0]; |
|
1285 6 [fillcolor="#7F7FFF", |
|
1286 fixedsize=true, |
|
1287 group=default, |
|
1288 height=1, |
|
1289 label=6, |
|
1290 pin=true, |
|
1291 pos="1,6!", |
|
1292 shape=circle, |
|
1293 style=filled, |
|
1294 width=1]; |
|
1295 5 -> 6 [arrowhead=none, |
|
1296 penwidth=2.0]; |
|
1297 10 [fillcolor="#7F7FFF", |
|
1298 fixedsize=true, |
|
1299 group=default, |
|
1300 height=1, |
|
1301 label=10, |
|
1302 pin=true, |
|
1303 pos="1,10!", |
|
1304 shape=circle, |
|
1305 style=filled, |
|
1306 width=1]; |
|
1307 6 -> 10 [arrowhead=none, |
|
1308 penwidth=2.0]; |
|
1309 11 [fillcolor="#DFDFFF", |
|
1310 fixedsize=true, |
|
1311 group=default_alt, |
|
1312 height=1, |
|
1313 label=11, |
|
1314 pin=true, |
|
1315 pos="2,11!", |
|
1316 shape=pentagon, |
|
1317 style="dotted, filled", |
|
1318 width=1]; |
|
1319 10 -> 11 [arrowhead=none, |
|
1320 penwidth=2.0]; |
|
1321 12 [fillcolor="#7F7FFF", |
|
1322 fixedsize=true, |
|
1323 group=default, |
|
1324 height=1, |
|
1325 label=12, |
|
1326 pin=true, |
|
1327 pos="1,12!", |
|
1328 shape=pentagon, |
|
1329 style=filled, |
|
1330 width=1]; |
|
1331 10 -> 12 [arrowhead=none, |
|
1332 penwidth=2.0]; |
|
1333 11 -> 12 [arrowtail=none, |
|
1334 dir=back, |
|
1335 minlen=0, |
|
1336 penwidth=2.0, |
|
1337 style=dashed]; |
|
1338 13 [fillcolor="#FF4F4F", |
|
1339 fixedsize=true, |
|
1340 group=default_alt, |
|
1341 height=1, |
|
1342 label=13, |
|
1343 pin=true, |
|
1344 pos="2,13!", |
|
1345 shape=pentagon, |
|
1346 style=filled, |
|
1347 width=1]; |
|
1348 11 -> 13 [arrowhead=none, |
|
1349 penwidth=2.0]; |
1109 penwidth=2.0]; |
1350 } |
1110 } |
1351 #endif |
1111 #endif |
1352 |
1112 |
1353 The older version 75954b8cd933 never ceased to exist in the local repo. It was |
1113 The older version 75954b8cd933 never ceased to exist in the local repo. It was |
1359 share it with the outside: |
1119 share it with the outside: |
1360 |
1120 |
1361 $ hg push other |
1121 $ hg push other |
1362 pushing to $TESTTMP/other (glob) |
1122 pushing to $TESTTMP/other (glob) |
1363 searching for changes |
1123 searching for changes |
1364 abort: push includes orphan changeset: bf1b0d202029! |
1124 abort: push includes unstable changeset: bf1b0d202029! |
1365 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
1125 (use 'hg evolve' to get a stable history or --force to ignore warnings) |
1366 [255] |
1126 [255] |
1367 |
1127 |
1368 |
1128 |
1369 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
1129 To resolve this unstable state, you need to rebase bf1b0d202029 onto |
1370 a44c85f957d3. The `hg evolve` command will do this for you. |
1130 a44c85f957d3. The `hg evolve` command will do this for you. |
1371 |
1131 |
1372 It has a --dry-run option to only suggest the next move. |
1132 It has a --dry-run option to only suggest the next move. |
1373 |
1133 |
1374 $ hg evolve --dry-run |
1134 $ hg evolve --dry-run |
1375 move:[13] animals |
1135 move:[15] animals |
1376 atop:[12] bathroom stuff |
1136 atop:[14] bathroom stuff |
1377 hg rebase -r bf1b0d202029 -d a44c85f957d3 |
1137 hg rebase -r bf1b0d202029 -d a44c85f957d3 |
1378 |
1138 |
1379 Let's do it |
1139 Let's do it |
1380 |
1140 |
1381 $ hg evolve |
1141 $ hg evolve |
1382 move:[13] animals |
1142 move:[15] animals |
1383 atop:[12] bathroom stuff |
1143 atop:[14] bathroom stuff |
1384 merging shopping |
1144 merging shopping |
1385 working directory is now at ee942144f952 |
1145 working directory is now at ee942144f952 |
1386 |
1146 |
1387 The old version of bathroom is hidden again. |
1147 The old version of bathroom is hidden again. |
1388 |
1148 |
1455 shape=circle, |
1191 shape=circle, |
1456 style=filled, |
1192 style=filled, |
1457 width=1]; |
1193 width=1]; |
1458 5 -> 6 [arrowhead=none, |
1194 5 -> 6 [arrowhead=none, |
1459 penwidth=2.0]; |
1195 penwidth=2.0]; |
1460 10 [fillcolor="#7F7FFF", |
|
1461 fixedsize=true, |
|
1462 group=default, |
|
1463 height=1, |
|
1464 label=10, |
|
1465 pin=true, |
|
1466 pos="1,10!", |
|
1467 shape=circle, |
|
1468 style=filled, |
|
1469 width=1]; |
|
1470 6 -> 10 [arrowhead=none, |
|
1471 penwidth=2.0]; |
|
1472 12 [fillcolor="#7F7FFF", |
|
1473 fixedsize=true, |
|
1474 group=default, |
|
1475 height=1, |
|
1476 label=12, |
|
1477 pin=true, |
|
1478 pos="1,12!", |
|
1479 shape=pentagon, |
|
1480 style=filled, |
|
1481 width=1]; |
|
1482 10 -> 12 [arrowhead=none, |
|
1483 penwidth=2.0]; |
|
1484 14 [fillcolor="#7F7FFF", |
|
1485 fixedsize=true, |
|
1486 group=default, |
|
1487 height=1, |
|
1488 label=14, |
|
1489 pin=true, |
|
1490 pos="1,14!", |
|
1491 shape=pentagon, |
|
1492 style=filled, |
|
1493 width=1]; |
|
1494 12 -> 14 [arrowhead=none, |
|
1495 penwidth=2.0]; |
1196 penwidth=2.0]; |
1496 } |
1197 } |
1497 #endif |
1198 #endif |
1498 |
1199 |
1499 We can push this evolution to remote. |
1200 We can push this evolution to remote. |
1503 searching for changes |
1204 searching for changes |
1504 adding changesets |
1205 adding changesets |
1505 adding manifests |
1206 adding manifests |
1506 adding file changes |
1207 adding file changes |
1507 added 2 changesets with 2 changes to 1 files (+1 heads) |
1208 added 2 changesets with 2 changes to 1 files (+1 heads) |
1508 2 new obsolescence markers |
1209 3 new obsolescence markers |
1509 obsoleted 2 changesets |
1210 obsoleted 2 changesets |
1510 |
1211 |
1511 Remote get a warning that current working directory is based on an obsolete |
1212 Remote get a warning that current working directory is based on an obsolete |
1512 changeset. |
1213 changeset. |
1513 |
1214 |
1544 searching for changes |
1245 searching for changes |
1545 adding changesets |
1246 adding changesets |
1546 adding manifests |
1247 adding manifests |
1547 adding file changes |
1248 adding file changes |
1548 added 1 changesets with 1 changes to 1 files |
1249 added 1 changesets with 1 changes to 1 files |
1549 new changesets 99f039c5ec9e |
|
1550 (run 'hg update' to get a working copy) |
1250 (run 'hg update' to get a working copy) |
1551 $ hg log -G |
1251 $ hg log -G |
1552 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
1252 o 99f039c5ec9e (draft): SPAM SPAM SPAM |
1553 | |
1253 | |
1554 @ ee942144f952 (draft): animals |
1254 @ ee942144f952 (draft): animals |
1619 shape=circle, |
1303 shape=circle, |
1620 style=filled, |
1304 style=filled, |
1621 width=1]; |
1305 width=1]; |
1622 5 -> 6 [arrowhead=none, |
1306 5 -> 6 [arrowhead=none, |
1623 penwidth=2.0]; |
1307 penwidth=2.0]; |
1624 10 [fillcolor="#7F7FFF", |
1308 fixedsize=true, |
1625 fixedsize=true, |
1309 group=default, |
1626 group=default, |
1310 pin=true, |
1627 height=1, |
1311 pos="1,7!", |
1628 label=10, |
1312 shape=circle, |
1629 pin=true, |
1313 style=filled, |
1630 pos="1,10!", |
1314 penwidth=2.0]; |
1631 shape=circle, |
1315 fixedsize=true, |
1632 style=filled, |
1316 group=default, |
1633 width=1]; |
1317 pin=true, |
1634 6 -> 10 [arrowhead=none, |
1318 pos="1,11!", |
1635 penwidth=2.0]; |
1319 shape=circle, |
1636 12 [fillcolor="#7F7FFF", |
1320 style=filled, |
1637 fixedsize=true, |
|
1638 group=default, |
|
1639 height=1, |
|
1640 label=12, |
|
1641 pin=true, |
|
1642 pos="1,12!", |
|
1643 shape=pentagon, |
|
1644 style=filled, |
|
1645 width=1]; |
|
1646 10 -> 12 [arrowhead=none, |
|
1647 penwidth=2.0]; |
1321 penwidth=2.0]; |
1648 14 [fillcolor="#7F7FFF", |
1322 14 [fillcolor="#7F7FFF", |
1649 fixedsize=true, |
1323 fixedsize=true, |
1650 group=default, |
1324 group=default, |
1651 height=1, |
1325 height=1, |
1652 label=14, |
1326 label=14, |
1653 pin=true, |
1327 pin=true, |
1654 pos="1,14!", |
1328 pos="1,14!", |
1655 shape=pentagon, |
1329 shape=pentagon, |
1656 style=filled, |
1330 style=filled, |
1657 width=1]; |
1331 penwidth=2.0]; |
1658 12 -> 14 [arrowhead=none, |
1332 fixedsize=true, |
1659 penwidth=2.0]; |
1333 group=default, |
1660 15 [fillcolor="#7F7FFF", |
1334 pin=true, |
1661 fixedsize=true, |
1335 pos="1,16!", |
1662 group=default, |
1336 shape=pentagon, |
1663 height=1, |
1337 style=filled, |
1664 label=15, |
|
1665 pin=true, |
|
1666 pos="1,15!", |
|
1667 shape=pentagon, |
|
1668 style=filled, |
|
1669 width=1]; |
|
1670 14 -> 15 [arrowhead=none, |
|
1671 penwidth=2.0]; |
1338 penwidth=2.0]; |
1672 } |
1339 } |
1673 #endif |
1340 #endif |
1674 |
1341 |
1675 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
1342 In the mean time I noticed you can't buy animals in a super market and I prune the animal changeset: |
1676 |
1343 |
1677 $ hg prune ee942144f952 |
1344 $ hg prune ee942144f952 |
1678 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1345 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1679 working directory now at a44c85f957d3 |
1346 working directory now at a44c85f957d3 |
1680 1 changesets pruned |
1347 1 changesets pruned |
1681 1 new orphan changesets |
1348 1 new unstable changesets |
1682 |
1349 |
1683 |
1350 |
1684 The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset |
1351 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. |
1352 is neither dead or obsolete. My repository is in an unstable state again. |
1686 |
1353 |
1755 shape=circle, |
1406 shape=circle, |
1756 style=filled, |
1407 style=filled, |
1757 width=1]; |
1408 width=1]; |
1758 5 -> 6 [arrowhead=none, |
1409 5 -> 6 [arrowhead=none, |
1759 penwidth=2.0]; |
1410 penwidth=2.0]; |
1760 10 [fillcolor="#7F7FFF", |
1411 fixedsize=true, |
1761 fixedsize=true, |
1412 group=default, |
1762 group=default, |
1413 pin=true, |
1763 height=1, |
1414 pos="1,7!", |
1764 label=10, |
1415 shape=circle, |
1765 pin=true, |
1416 style=filled, |
1766 pos="1,10!", |
1417 penwidth=2.0]; |
1767 shape=circle, |
1418 fixedsize=true, |
1768 style=filled, |
1419 group=default, |
1769 width=1]; |
1420 pin=true, |
1770 6 -> 10 [arrowhead=none, |
1421 pos="1,11!", |
1771 penwidth=2.0]; |
1422 shape=circle, |
1772 12 [fillcolor="#7F7FFF", |
1423 style=filled, |
1773 fixedsize=true, |
1424 width=0.5]; |
1774 group=default, |
1425 7 -> 11 [arrowhead=none, |
1775 height=1, |
1426 penwidth=2.0]; |
1776 label=12, |
1427 14 [fillcolor="#9999FF", |
1777 pin=true, |
1428 fixedsize=true, |
1778 pos="1,12!", |
1429 group=default, |
1779 shape=pentagon, |
1430 height=0.5, |
1780 style=filled, |
1431 label=14, |
1781 width=1]; |
1432 pin=true, |
1782 10 -> 12 [arrowhead=none, |
1433 pos="1,14!", |
1783 penwidth=2.0]; |
1434 shape=pentagon, |
1784 14 [fillcolor="#DFDFFF", |
1435 style=filled, |
|
1436 penwidth=2.0]; |
|
1437 16 [fillcolor="#DFDFFF", |
1785 fixedsize=true, |
1438 fixedsize=true, |
1786 group=default_alt, |
1439 group=default_alt, |
1787 height=1, |
1440 pin=true, |
1788 label=14, |
1441 pos="2,16!", |
1789 pin=true, |
|
1790 pos="2,14!", |
|
1791 shape=pentagon, |
1442 shape=pentagon, |
1792 style="dotted, filled", |
1443 style="dotted, filled", |
1793 width=1]; |
1444 penwidth=2.0]; |
1794 12 -> 14 [arrowhead=none, |
1445 17 [fillcolor="#FF4F4F", |
1795 penwidth=2.0]; |
|
1796 15 [fillcolor="#FF4F4F", |
|
1797 fixedsize=true, |
1446 fixedsize=true, |
1798 group=default_alt, |
1447 group=default_alt, |
1799 height=1, |
1448 pin=true, |
1800 label=15, |
1449 pos="2,17!", |
1801 pin=true, |
1450 shape=pentagon, |
1802 pos="2,15!", |
1451 style=filled, |
1803 shape=pentagon, |
|
1804 style=filled, |
|
1805 width=1]; |
|
1806 14 -> 15 [arrowhead=none, |
|
1807 penwidth=2.0]; |
1452 penwidth=2.0]; |
1808 } |
1453 } |
1809 #endif |
1454 #endif |
1810 |
1455 |
1811 $ hg log -r "orphan()" |
1456 $ hg log -r "orphan()" |
1818 strict digraph "Mercurial graph" { |
1463 strict digraph "Mercurial graph" { |
1819 graph [rankdir=LR, |
1464 graph [rankdir=LR, |
1820 splines=polyline |
1465 splines=polyline |
1821 ]; |
1466 ]; |
1822 node [label="\N"]; |
1467 node [label="\N"]; |
1823 15 [fillcolor="#FF4F4F", |
1468 17 [fillcolor="#FF4F4F", |
1824 fixedsize=true, |
1469 fixedsize=true, |
1825 group=default_alt, |
1470 group=default_alt, |
1826 height=1, |
1471 pin=true, |
1827 label=15, |
1472 pos="1,17!", |
1828 pin=true, |
|
1829 pos="1,15!", |
|
1830 shape=pentagon, |
1473 shape=pentagon, |
1831 style=filled, |
1474 style=filled, |
1832 width=1]; |
1475 width=1]; |
1833 } |
1476 } |
1834 #endif |
1477 #endif |
1835 |
1478 |
1836 $ hg evolve |
1479 $ hg evolve |
1837 move:[15] SPAM SPAM SPAM |
1480 move:[17] SPAM SPAM SPAM |
1838 atop:[12] bathroom stuff |
1481 atop:[14] bathroom stuff |
1839 merging shopping |
1482 merging shopping |
1840 working directory is now at 40aa40daeefb |
1483 working directory is now at 40aa40daeefb |
1841 |
1484 |
1842 $ hg log -G |
1485 $ hg log -G |
1843 @ 40aa40daeefb (draft): SPAM SPAM SPAM |
1486 @ 40aa40daeefb (draft): SPAM SPAM SPAM |
1908 shape=circle, |
1535 shape=circle, |
1909 style=filled, |
1536 style=filled, |
1910 width=1]; |
1537 width=1]; |
1911 5 -> 6 [arrowhead=none, |
1538 5 -> 6 [arrowhead=none, |
1912 penwidth=2.0]; |
1539 penwidth=2.0]; |
1913 10 [fillcolor="#7F7FFF", |
1540 fixedsize=true, |
1914 fixedsize=true, |
1541 group=default, |
1915 group=default, |
1542 pin=true, |
1916 height=1, |
1543 pos="1,7!", |
1917 label=10, |
1544 shape=circle, |
1918 pin=true, |
1545 style=filled, |
1919 pos="1,10!", |
1546 penwidth=2.0]; |
1920 shape=circle, |
1547 fixedsize=true, |
1921 style=filled, |
1548 group=default, |
1922 width=1]; |
1549 pin=true, |
1923 6 -> 10 [arrowhead=none, |
1550 pos="1,11!", |
1924 penwidth=2.0]; |
1551 shape=circle, |
1925 12 [fillcolor="#7F7FFF", |
1552 style=filled, |
1926 fixedsize=true, |
1553 width=0.5]; |
1927 group=default, |
1554 7 -> 11 [arrowhead=none, |
1928 height=1, |
1555 penwidth=2.0]; |
1929 label=12, |
1556 14 [fillcolor="#9999FF", |
1930 pin=true, |
1557 fixedsize=true, |
1931 pos="1,12!", |
1558 group=default, |
1932 shape=pentagon, |
1559 height=0.5, |
1933 style=filled, |
1560 label=14, |
1934 width=1]; |
1561 pin=true, |
1935 10 -> 12 [arrowhead=none, |
1562 pos="1,14!", |
1936 penwidth=2.0]; |
1563 shape=pentagon, |
1937 16 [fillcolor="#7F7FFF", |
1564 style=filled, |
1938 fixedsize=true, |
1565 penwidth=2.0]; |
1939 group=default, |
1566 fixedsize=true, |
1940 height=1, |
1567 group=default, |
1941 label=16, |
1568 pin=true, |
1942 pin=true, |
1569 pos="1,18!", |
1943 pos="1,16!", |
1570 shape=pentagon, |
1944 shape=pentagon, |
1571 style=filled, |
1945 style=filled, |
|
1946 width=1]; |
|
1947 12 -> 16 [arrowhead=none, |
|
1948 penwidth=2.0]; |
1572 penwidth=2.0]; |
1949 } |
1573 } |
1950 #endif |
1574 #endif |
1951 |
1575 |
1952 Handling Divergent amend |
1576 Handling Divergent amend |