51 |
51 |
52 Topic branches are lightweight branches which disappear when changes are |
52 Topic branches are lightweight branches which disappear when changes are |
53 finalized (moved to the public phase). They can help users to organize and share |
53 finalized (moved to the public phase). They can help users to organize and share |
54 their unfinished work. |
54 their unfinished work. |
55 |
55 |
56 In this tutorial, we explain how to use topics for local development. In the first part, |
56 In this tutorial, we explain how to use topics for local development. In the |
57 there is a central *publishing* server. Anything pushed to the central server will become public and immutable This means no unfinished work should escapes the local repository. |
57 first part, there is a central *publishing* server. Anything pushed to the |
|
58 central server will become public and immutable. This means no unfinished work |
|
59 should escape the local repository. |
58 |
60 |
59 |
61 |
60 Topic Basics |
62 Topic Basics |
61 ============ |
63 ============ |
62 |
64 |
694 |
696 |
695 |
697 |
696 Keep working within topics |
698 Keep working within topics |
697 ========================== |
699 ========================== |
698 |
700 |
699 Making sure all your new local commit are made within a topic will help your |
701 Making sure all your new local commit are made within a topic will help you |
700 organise your work. It is possible to ensure this through the Mercurial |
702 organize your work. It is possible to ensure this through the Mercurial |
701 configuration. |
703 configuration. |
702 |
704 |
703 For this tutorial, we'll add the config at the repository level: |
705 For this tutorial, we'll add the config at the repository level: |
704 |
706 |
705 $ cat << EOF >> .hg/hgrc |
707 $ cat << EOF >> .hg/hgrc |
725 |
727 |
726 |
728 |
727 Working with Multiple Topics |
729 Working with Multiple Topics |
728 ============================ |
730 ============================ |
729 |
731 |
730 In the above example, topics do not bring much benefits since you only have one |
732 In the above example, topics do not bring many benefits since you only have one |
731 line of development. Topics start to be more useful when you have to work on |
733 line of development. Topics start to be more useful when you have to work on |
732 multiple features at the same time. |
734 multiple features at the same time. |
733 |
735 |
734 We might go shopping in a hardware store in the same go, so let's add some |
736 We might go shopping in a hardware store in the same go, so let's add some |
735 tools to the shopping list within a new topic: |
737 tools to the shopping list within a new topic: |
896 #if docgraph-ext |
898 #if docgraph-ext |
897 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
899 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
898 .. graphviz:: |
900 .. graphviz:: |
899 |
901 |
900 strict digraph "Mercurial graph" { |
902 strict digraph "Mercurial graph" { |
901 graph [rankdir=LR, |
903 graph [rankdir=LR, |
902 splines=polyline |
904 splines=polyline |
903 ]; |
905 ]; |
904 node [label="\N"]; |
906 node [label="\N"]; |
905 0 [fillcolor="#7F7FFF", |
907 0 [fillcolor="#7F7FFF", |
906 fixedsize=true, |
908 fixedsize=true, |
907 group=default, |
909 group=default, |
908 height=1, |
910 height=1, |
909 label=0, |
911 label=0, |
910 pin=true, |
912 pin=true, |
911 pos="1,0!", |
913 pos="1,0!", |
912 shape=circle, |
914 shape=circle, |
913 style=filled, |
915 style=filled, |
914 width=1]; |
916 width=1]; |
915 3 [fillcolor="#7F7FFF", |
917 3 [fillcolor="#7F7FFF", |
916 fixedsize=true, |
918 fixedsize=true, |
917 group=default, |
919 group=default, |
918 height=1, |
920 height=1, |
919 label=3, |
921 label=3, |
920 pin=true, |
922 pin=true, |
921 pos="1,3!", |
923 pos="1,3!", |
922 shape=circle, |
924 shape=circle, |
923 style=filled, |
925 style=filled, |
924 width=1]; |
926 width=1]; |
925 0 -> 3 [arrowhead=none, |
927 0 -> 3 [arrowhead=none, |
926 penwidth=2.0]; |
928 penwidth=2.0]; |
927 4 [fillcolor="#7F7FFF", |
929 4 [fillcolor="#7F7FFF", |
928 fixedsize=true, |
930 fixedsize=true, |
929 group=default, |
931 group=default, |
930 height=1, |
932 height=1, |
931 label=4, |
933 label=4, |
932 pin=true, |
934 pin=true, |
933 pos="1,4!", |
935 pos="1,4!", |
934 shape=circle, |
936 shape=circle, |
935 style=filled, |
937 style=filled, |
936 width=1]; |
938 width=1]; |
937 3 -> 4 [arrowhead=none, |
939 3 -> 4 [arrowhead=none, |
938 penwidth=2.0]; |
940 penwidth=2.0]; |
939 5 [fillcolor="#7F7FFF", |
941 5 [fillcolor="#7F7FFF", |
940 fixedsize=true, |
942 fixedsize=true, |
941 group=default, |
943 group=default, |
942 height=1, |
944 height=1, |
943 label=5, |
945 label=5, |
944 pin=true, |
946 pin=true, |
945 pos="1,5!", |
947 pos="1,5!", |
946 shape=circle, |
948 shape=circle, |
947 style=filled, |
949 style=filled, |
948 width=1]; |
950 width=1]; |
949 4 -> 5 [arrowhead=none, |
951 4 -> 5 [arrowhead=none, |
950 penwidth=2.0]; |
952 penwidth=2.0]; |
951 6 [fillcolor="#7F7FFF", |
953 6 [fillcolor="#7F7FFF", |
952 fixedsize=true, |
954 fixedsize=true, |
953 group=default, |
955 group=default, |
954 height=1, |
956 height=1, |
955 label=6, |
957 label=6, |
956 pin=true, |
958 pin=true, |
957 pos="1,6!", |
959 pos="1,6!", |
958 shape=pentagon, |
960 shape=pentagon, |
959 style=filled, |
961 style=filled, |
960 width=1]; |
962 width=1]; |
961 5 -> 6 [arrowhead=none, |
963 5 -> 6 [arrowhead=none, |
962 penwidth=2.0]; |
964 penwidth=2.0]; |
963 9 [fillcolor="#7F7FFF", |
965 9 [fillcolor="#7F7FFF", |
964 fixedsize=true, |
966 fixedsize=true, |
965 group=default, |
967 group=default, |
966 height=1, |
968 height=1, |
967 label=9, |
969 label=9, |
968 pin=true, |
970 pin=true, |
969 pos="1,9!", |
971 pos="1,9!", |
970 shape=pentagon, |
972 shape=pentagon, |
971 style=filled, |
973 style=filled, |
972 width=1]; |
974 width=1]; |
973 5 -> 9 [arrowhead=none, |
975 5 -> 9 [arrowhead=none, |
974 penwidth=2.0]; |
976 penwidth=2.0]; |
975 11 [fillcolor="#7F7FFF", |
977 11 [fillcolor="#7F7FFF", |
976 fixedsize=true, |
978 fixedsize=true, |
977 group=default, |
979 group=default, |
978 height=1, |
980 height=1, |
979 label=11, |
981 label=11, |
980 pin=true, |
982 pin=true, |
981 pos="1,11!", |
983 pos="1,11!", |
982 shape=circle, |
984 shape=circle, |
983 style=filled, |
985 style=filled, |
984 width=1]; |
986 width=1]; |
985 5 -> 11 [arrowhead=none, |
987 5 -> 11 [arrowhead=none, |
986 penwidth=2.0]; |
988 penwidth=2.0]; |
987 7 [fillcolor="#7F7FFF", |
989 7 [fillcolor="#7F7FFF", |
988 fixedsize=true, |
990 fixedsize=true, |
989 group=default, |
991 group=default, |
990 height=1, |
992 height=1, |
991 label=7, |
993 label=7, |
992 pin=true, |
994 pin=true, |
993 pos="1,7!", |
995 pos="1,7!", |
994 shape=pentagon, |
996 shape=pentagon, |
995 style=filled, |
997 style=filled, |
996 width=1]; |
998 width=1]; |
997 6 -> 7 [arrowhead=none, |
999 6 -> 7 [arrowhead=none, |
998 penwidth=2.0]; |
1000 penwidth=2.0]; |
999 8 [fillcolor="#7F7FFF", |
1001 8 [fillcolor="#7F7FFF", |
1000 fixedsize=true, |
1002 fixedsize=true, |
1001 group=default, |
1003 group=default, |
1002 height=1, |
1004 height=1, |
1003 label=8, |
1005 label=8, |
1004 pin=true, |
1006 pin=true, |
1005 pos="1,8!", |
1007 pos="1,8!", |
1006 shape=pentagon, |
1008 shape=pentagon, |
1007 style=filled, |
1009 style=filled, |
1008 width=1]; |
1010 width=1]; |
1009 7 -> 8 [arrowhead=none, |
1011 7 -> 8 [arrowhead=none, |
1010 penwidth=2.0]; |
1012 penwidth=2.0]; |
1011 10 [fillcolor="#7F7FFF", |
1013 10 [fillcolor="#7F7FFF", |
1012 fixedsize=true, |
1014 fixedsize=true, |
1013 group=default, |
1015 group=default, |
1014 height=1, |
1016 height=1, |
1015 label=10, |
1017 label=10, |
1016 pin=true, |
1018 pin=true, |
1017 pos="1,10!", |
1019 pos="1,10!", |
1018 shape=pentagon, |
1020 shape=pentagon, |
1019 style=filled, |
1021 style=filled, |
1020 width=1]; |
1022 width=1]; |
1021 9 -> 10 [arrowhead=none, |
1023 9 -> 10 [arrowhead=none, |
1022 penwidth=2.0]; |
1024 penwidth=2.0]; |
1023 12 [fillcolor="#7F7FFF", |
1025 12 [fillcolor="#7F7FFF", |
1024 fixedsize=true, |
1026 fixedsize=true, |
1025 group=default, |
1027 group=default, |
1026 height=1, |
1028 height=1, |
1027 label=12, |
1029 label=12, |
1028 pin=true, |
1030 pin=true, |
1029 pos="1,12!", |
1031 pos="1,12!", |
1030 shape=circle, |
1032 shape=circle, |
1031 style=filled, |
1033 style=filled, |
1032 width=1]; |
1034 width=1]; |
1033 11 -> 12 [arrowhead=none, |
1035 11 -> 12 [arrowhead=none, |
1034 penwidth=2.0]; |
1036 penwidth=2.0]; |
1035 } |
1037 } |
1036 #endif |
1038 #endif |
1037 |
1039 |
1038 $ hg rebase |
1040 $ hg rebase |
1039 rebasing 6:183984ef46d1 "Adding hammer" (tools) |
1041 rebasing 6:183984ef46d1 "Adding hammer" (tools) |
1239 #if docgraph-ext |
1241 #if docgraph-ext |
1240 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore |
1242 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore |
1241 .. graphviz:: |
1243 .. graphviz:: |
1242 |
1244 |
1243 strict digraph "Mercurial graph" { |
1245 strict digraph "Mercurial graph" { |
1244 graph [rankdir=LR, |
1246 graph [rankdir=LR, |
1245 splines=polyline |
1247 splines=polyline |
1246 ]; |
1248 ]; |
1247 node [label="\N"]; |
1249 node [label="\N"]; |
1248 12 [fillcolor="#7F7FFF", |
1250 12 [fillcolor="#7F7FFF", |
1249 fixedsize=true, |
1251 fixedsize=true, |
1250 group=default, |
1252 group=default, |
1251 height=1, |
1253 height=1, |
1252 label=12, |
1254 label=12, |
1253 pin=true, |
1255 pin=true, |
1254 pos="1,12!", |
1256 pos="1,12!", |
1255 shape=circle, |
1257 shape=circle, |
1256 style=filled, |
1258 style=filled, |
1257 width=1]; |
1259 width=1]; |
1258 13 [fillcolor="#DFDFFF", |
1260 13 [fillcolor="#DFDFFF", |
1259 fixedsize=true, |
1261 fixedsize=true, |
1260 group=default_alt, |
1262 group=default_alt, |
1261 height=1, |
1263 height=1, |
1262 label=13, |
1264 label=13, |
1263 pin=true, |
1265 pin=true, |
1264 pos="2,13!", |
1266 pos="2,13!", |
1265 shape=pentagon, |
1267 shape=pentagon, |
1266 style="dotted, filled", |
1268 style="dotted, filled", |
1267 width=1]; |
1269 width=1]; |
1268 12 -> 13 [arrowhead=none, |
1270 12 -> 13 [arrowhead=none, |
1269 penwidth=2.0]; |
1271 penwidth=2.0]; |
1270 18 [fillcolor="#7F7FFF", |
1272 18 [fillcolor="#7F7FFF", |
1271 fixedsize=true, |
1273 fixedsize=true, |
1272 group=default, |
1274 group=default, |
1273 height=1, |
1275 height=1, |
1274 label=18, |
1276 label=18, |
1275 pin=true, |
1277 pin=true, |
1276 pos="1,18!", |
1278 pos="1,18!", |
1277 shape=pentagon, |
1279 shape=pentagon, |
1278 style=filled, |
1280 style=filled, |
1279 width=1]; |
1281 width=1]; |
1280 12 -> 18 [arrowhead=none, |
1282 12 -> 18 [arrowhead=none, |
1281 penwidth=2.0]; |
1283 penwidth=2.0]; |
1282 16 [fillcolor="#7F7FFF", |
1284 16 [fillcolor="#7F7FFF", |
1283 fixedsize=true, |
1285 fixedsize=true, |
1284 group=default, |
1286 group=default, |
1285 height=1, |
1287 height=1, |
1286 label=16, |
1288 label=16, |
1287 pin=true, |
1289 pin=true, |
1288 pos="1,16!", |
1290 pos="1,16!", |
1289 shape=circle, |
1291 shape=circle, |
1290 style=filled, |
1292 style=filled, |
1291 width=1]; |
1293 width=1]; |
1292 12 -> 16 [arrowhead=none, |
1294 12 -> 16 [arrowhead=none, |
1293 penwidth=2.0]; |
1295 penwidth=2.0]; |
1294 13 -> 18 [arrowtail=none, |
1296 13 -> 18 [arrowtail=none, |
1295 dir=back, |
1297 dir=back, |
1296 minlen=0, |
1298 minlen=0, |
1297 penwidth=2.0, |
1299 penwidth=2.0, |
1298 style=dashed]; |
1300 style=dashed]; |
1299 14 [fillcolor="#FF4F4F", |
1301 14 [fillcolor="#FF4F4F", |
1300 fixedsize=true, |
1302 fixedsize=true, |
1301 group=default_alt, |
1303 group=default_alt, |
1302 height=1, |
1304 height=1, |
1303 label=14, |
1305 label=14, |
1304 pin=true, |
1306 pin=true, |
1305 pos="2,14!", |
1307 pos="2,14!", |
1306 shape=pentagon, |
1308 shape=pentagon, |
1307 style=filled, |
1309 style=filled, |
1308 width=1]; |
1310 width=1]; |
1309 13 -> 14 [arrowhead=none, |
1311 13 -> 14 [arrowhead=none, |
1310 penwidth=2.0]; |
1312 penwidth=2.0]; |
1311 15 [fillcolor="#FF4F4F", |
1313 15 [fillcolor="#FF4F4F", |
1312 fixedsize=true, |
1314 fixedsize=true, |
1313 group=default_alt, |
1315 group=default_alt, |
1314 height=1, |
1316 height=1, |
1315 label=15, |
1317 label=15, |
1316 pin=true, |
1318 pin=true, |
1317 pos="2,15!", |
1319 pos="2,15!", |
1318 shape=pentagon, |
1320 shape=pentagon, |
1319 style=filled, |
1321 style=filled, |
1320 width=1]; |
1322 width=1]; |
1321 14 -> 15 [arrowhead=none, |
1323 14 -> 15 [arrowhead=none, |
1322 penwidth=2.0]; |
1324 penwidth=2.0]; |
1323 17 [fillcolor="#7F7FFF", |
1325 17 [fillcolor="#7F7FFF", |
1324 fixedsize=true, |
1326 fixedsize=true, |
1325 group=default, |
1327 group=default, |
1326 height=1, |
1328 height=1, |
1327 label=17, |
1329 label=17, |
1328 pin=true, |
1330 pin=true, |
1329 pos="1,17!", |
1331 pos="1,17!", |
1330 shape=circle, |
1332 shape=circle, |
1331 style=filled, |
1333 style=filled, |
1332 width=1]; |
1334 width=1]; |
1333 16 -> 17 [arrowhead=none, |
1335 16 -> 17 [arrowhead=none, |
1334 penwidth=2.0]; |
1336 penwidth=2.0]; |
1335 } |
1337 } |
1336 #endif |
1338 #endif |
1337 |
1339 |
1338 Fortunately stack shows you a better visualization: |
1340 Fortunately stack shows you a better visualization: |
1339 |
1341 |
1420 #if docgraph-ext |
1422 #if docgraph-ext |
1421 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore |
1423 $ hg docgraph -r "t0::" --sphinx-directive --rankdir LR #rest-ignore |
1422 .. graphviz:: |
1424 .. graphviz:: |
1423 |
1425 |
1424 strict digraph "Mercurial graph" { |
1426 strict digraph "Mercurial graph" { |
1425 graph [rankdir=LR, |
1427 graph [rankdir=LR, |
1426 splines=polyline |
1428 splines=polyline |
1427 ]; |
1429 ]; |
1428 node [label="\N"]; |
1430 node [label="\N"]; |
1429 12 [fillcolor="#7F7FFF", |
1431 12 [fillcolor="#7F7FFF", |
1430 fixedsize=true, |
1432 fixedsize=true, |
1431 group=default, |
1433 group=default, |
1432 height=1, |
1434 height=1, |
1433 label=12, |
1435 label=12, |
1434 pin=true, |
1436 pin=true, |
1435 pos="1,12!", |
1437 pos="1,12!", |
1436 shape=circle, |
1438 shape=circle, |
1437 style=filled, |
1439 style=filled, |
1438 width=1]; |
1440 width=1]; |
1439 16 [fillcolor="#7F7FFF", |
1441 16 [fillcolor="#7F7FFF", |
1440 fixedsize=true, |
1442 fixedsize=true, |
1441 group=default, |
1443 group=default, |
1442 height=1, |
1444 height=1, |
1443 label=16, |
1445 label=16, |
1444 pin=true, |
1446 pin=true, |
1445 pos="1,16!", |
1447 pos="1,16!", |
1446 shape=circle, |
1448 shape=circle, |
1447 style=filled, |
1449 style=filled, |
1448 width=1]; |
1450 width=1]; |
1449 12 -> 16 [arrowhead=none, |
1451 12 -> 16 [arrowhead=none, |
1450 penwidth=2.0]; |
1452 penwidth=2.0]; |
1451 18 [fillcolor="#7F7FFF", |
1453 18 [fillcolor="#7F7FFF", |
1452 fixedsize=true, |
1454 fixedsize=true, |
1453 group=default, |
1455 group=default, |
1454 height=1, |
1456 height=1, |
1455 label=18, |
1457 label=18, |
1456 pin=true, |
1458 pin=true, |
1457 pos="1,18!", |
1459 pos="1,18!", |
1458 shape=pentagon, |
1460 shape=pentagon, |
1459 style=filled, |
1461 style=filled, |
1460 width=1]; |
1462 width=1]; |
1461 12 -> 18 [arrowhead=none, |
1463 12 -> 18 [arrowhead=none, |
1462 penwidth=2.0]; |
1464 penwidth=2.0]; |
1463 17 [fillcolor="#7F7FFF", |
1465 17 [fillcolor="#7F7FFF", |
1464 fixedsize=true, |
1466 fixedsize=true, |
1465 group=default, |
1467 group=default, |
1466 height=1, |
1468 height=1, |
1467 label=17, |
1469 label=17, |
1468 pin=true, |
1470 pin=true, |
1469 pos="1,17!", |
1471 pos="1,17!", |
1470 shape=circle, |
1472 shape=circle, |
1471 style=filled, |
1473 style=filled, |
1472 width=1]; |
1474 width=1]; |
1473 16 -> 17 [arrowhead=none, |
1475 16 -> 17 [arrowhead=none, |
1474 penwidth=2.0]; |
1476 penwidth=2.0]; |
1475 19 [fillcolor="#7F7FFF", |
1477 19 [fillcolor="#7F7FFF", |
1476 fixedsize=true, |
1478 fixedsize=true, |
1477 group=default, |
1479 group=default, |
1478 height=1, |
1480 height=1, |
1479 label=19, |
1481 label=19, |
1480 pin=true, |
1482 pin=true, |
1481 pos="1,19!", |
1483 pos="1,19!", |
1482 shape=pentagon, |
1484 shape=pentagon, |
1483 style=filled, |
1485 style=filled, |
1484 width=1]; |
1486 width=1]; |
1485 18 -> 19 [arrowhead=none, |
1487 18 -> 19 [arrowhead=none, |
1486 penwidth=2.0]; |
1488 penwidth=2.0]; |
1487 20 [fillcolor="#7F7FFF", |
1489 20 [fillcolor="#7F7FFF", |
1488 fixedsize=true, |
1490 fixedsize=true, |
1489 group=default, |
1491 group=default, |
1490 height=1, |
1492 height=1, |
1491 label=20, |
1493 label=20, |
1492 pin=true, |
1494 pin=true, |
1493 pos="1,20!", |
1495 pos="1,20!", |
1494 shape=pentagon, |
1496 shape=pentagon, |
1495 style=filled, |
1497 style=filled, |
1496 width=1]; |
1498 width=1]; |
1497 19 -> 20 [arrowhead=none, |
1499 19 -> 20 [arrowhead=none, |
1498 penwidth=2.0]; |
1500 penwidth=2.0]; |
1499 } |
1501 } |
1500 #endif |
1502 #endif |
1501 Multi-headed stack |
1503 Multi-headed stack |
1502 ------------------ |
1504 ------------------ |
1503 |
1505 |
1602 #if docgraph-ext |
1604 #if docgraph-ext |
1603 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
1605 $ hg docgraph -r "all()" --sphinx-directive --rankdir LR #rest-ignore |
1604 .. graphviz:: |
1606 .. graphviz:: |
1605 |
1607 |
1606 strict digraph "Mercurial graph" { |
1608 strict digraph "Mercurial graph" { |
1607 graph [rankdir=LR, |
1609 graph [rankdir=LR, |
1608 splines=polyline |
1610 splines=polyline |
1609 ]; |
1611 ]; |
1610 node [label="\N"]; |
1612 node [label="\N"]; |
1611 0 [fillcolor="#7F7FFF", |
1613 0 [fillcolor="#7F7FFF", |
1612 fixedsize=true, |
1614 fixedsize=true, |
1613 group=default, |
1615 group=default, |
1614 height=1, |
1616 height=1, |
1615 label=0, |
1617 label=0, |
1616 pin=true, |
1618 pin=true, |
1617 pos="1,0!", |
1619 pos="1,0!", |
1618 shape=circle, |
1620 shape=circle, |
1619 style=filled, |
1621 style=filled, |
1620 width=1]; |
1622 width=1]; |
1621 3 [fillcolor="#7F7FFF", |
1623 3 [fillcolor="#7F7FFF", |
1622 fixedsize=true, |
1624 fixedsize=true, |
1623 group=default, |
1625 group=default, |
1624 height=1, |
1626 height=1, |
1625 label=3, |
1627 label=3, |
1626 pin=true, |
1628 pin=true, |
1627 pos="1,3!", |
1629 pos="1,3!", |
1628 shape=circle, |
1630 shape=circle, |
1629 style=filled, |
1631 style=filled, |
1630 width=1]; |
1632 width=1]; |
1631 0 -> 3 [arrowhead=none, |
1633 0 -> 3 [arrowhead=none, |
1632 penwidth=2.0]; |
1634 penwidth=2.0]; |
1633 4 [fillcolor="#7F7FFF", |
1635 4 [fillcolor="#7F7FFF", |
1634 fixedsize=true, |
1636 fixedsize=true, |
1635 group=default, |
1637 group=default, |
1636 height=1, |
1638 height=1, |
1637 label=4, |
1639 label=4, |
1638 pin=true, |
1640 pin=true, |
1639 pos="1,4!", |
1641 pos="1,4!", |
1640 shape=circle, |
1642 shape=circle, |
1641 style=filled, |
1643 style=filled, |
1642 width=1]; |
1644 width=1]; |
1643 3 -> 4 [arrowhead=none, |
1645 3 -> 4 [arrowhead=none, |
1644 penwidth=2.0]; |
1646 penwidth=2.0]; |
1645 5 [fillcolor="#7F7FFF", |
1647 5 [fillcolor="#7F7FFF", |
1646 fixedsize=true, |
1648 fixedsize=true, |
1647 group=default, |
1649 group=default, |
1648 height=1, |
1650 height=1, |
1649 label=5, |
1651 label=5, |
1650 pin=true, |
1652 pin=true, |
1651 pos="1,5!", |
1653 pos="1,5!", |
1652 shape=circle, |
1654 shape=circle, |
1653 style=filled, |
1655 style=filled, |
1654 width=1]; |
1656 width=1]; |
1655 4 -> 5 [arrowhead=none, |
1657 4 -> 5 [arrowhead=none, |
1656 penwidth=2.0]; |
1658 penwidth=2.0]; |
1657 11 [fillcolor="#7F7FFF", |
1659 11 [fillcolor="#7F7FFF", |
1658 fixedsize=true, |
1660 fixedsize=true, |
1659 group=default, |
1661 group=default, |
1660 height=1, |
1662 height=1, |
1661 label=11, |
1663 label=11, |
1662 pin=true, |
1664 pin=true, |
1663 pos="1,11!", |
1665 pos="1,11!", |
1664 shape=circle, |
1666 shape=circle, |
1665 style=filled, |
1667 style=filled, |
1666 width=1]; |
1668 width=1]; |
1667 5 -> 11 [arrowhead=none, |
1669 5 -> 11 [arrowhead=none, |
1668 penwidth=2.0]; |
1670 penwidth=2.0]; |
1669 12 [fillcolor="#7F7FFF", |
1671 12 [fillcolor="#7F7FFF", |
1670 fixedsize=true, |
1672 fixedsize=true, |
1671 group=default, |
1673 group=default, |
1672 height=1, |
1674 height=1, |
1673 label=12, |
1675 label=12, |
1674 pin=true, |
1676 pin=true, |
1675 pos="1,12!", |
1677 pos="1,12!", |
1676 shape=circle, |
1678 shape=circle, |
1677 style=filled, |
1679 style=filled, |
1678 width=1]; |
1680 width=1]; |
1679 11 -> 12 [arrowhead=none, |
1681 11 -> 12 [arrowhead=none, |
1680 penwidth=2.0]; |
1682 penwidth=2.0]; |
1681 16 [fillcolor="#7F7FFF", |
1683 16 [fillcolor="#7F7FFF", |
1682 fixedsize=true, |
1684 fixedsize=true, |
1683 group=default, |
1685 group=default, |
1684 height=1, |
1686 height=1, |
1685 label=16, |
1687 label=16, |
1686 pin=true, |
1688 pin=true, |
1687 pos="1,16!", |
1689 pos="1,16!", |
1688 shape=circle, |
1690 shape=circle, |
1689 style=filled, |
1691 style=filled, |
1690 width=1]; |
1692 width=1]; |
1691 12 -> 16 [arrowhead=none, |
1693 12 -> 16 [arrowhead=none, |
1692 penwidth=2.0]; |
1694 penwidth=2.0]; |
1693 18 [fillcolor="#7F7FFF", |
1695 18 [fillcolor="#7F7FFF", |
1694 fixedsize=true, |
1696 fixedsize=true, |
1695 group=default, |
1697 group=default, |
1696 height=1, |
1698 height=1, |
1697 label=18, |
1699 label=18, |
1698 pin=true, |
1700 pin=true, |
1699 pos="1,18!", |
1701 pos="1,18!", |
1700 shape=pentagon, |
1702 shape=pentagon, |
1701 style=filled, |
1703 style=filled, |
1702 width=1]; |
1704 width=1]; |
1703 12 -> 18 [arrowhead=none, |
1705 12 -> 18 [arrowhead=none, |
1704 penwidth=2.0]; |
1706 penwidth=2.0]; |
1705 17 [fillcolor="#7F7FFF", |
1707 17 [fillcolor="#7F7FFF", |
1706 fixedsize=true, |
1708 fixedsize=true, |
1707 group=default, |
1709 group=default, |
1708 height=1, |
1710 height=1, |
1709 label=17, |
1711 label=17, |
1710 pin=true, |
1712 pin=true, |
1711 pos="1,17!", |
1713 pos="1,17!", |
1712 shape=circle, |
1714 shape=circle, |
1713 style=filled, |
1715 style=filled, |
1714 width=1]; |
1716 width=1]; |
1715 16 -> 17 [arrowhead=none, |
1717 16 -> 17 [arrowhead=none, |
1716 penwidth=2.0]; |
1718 penwidth=2.0]; |
1717 19 [fillcolor="#7F7FFF", |
1719 19 [fillcolor="#7F7FFF", |
1718 fixedsize=true, |
1720 fixedsize=true, |
1719 group=default, |
1721 group=default, |
1720 height=1, |
1722 height=1, |
1721 label=19, |
1723 label=19, |
1722 pin=true, |
1724 pin=true, |
1723 pos="1,19!", |
1725 pos="1,19!", |
1724 shape=pentagon, |
1726 shape=pentagon, |
1725 style=filled, |
1727 style=filled, |
1726 width=1]; |
1728 width=1]; |
1727 18 -> 19 [arrowhead=none, |
1729 18 -> 19 [arrowhead=none, |
1728 penwidth=2.0]; |
1730 penwidth=2.0]; |
1729 21 [fillcolor="#7F7FFF", |
1731 21 [fillcolor="#7F7FFF", |
1730 fixedsize=true, |
1732 fixedsize=true, |
1731 group=default, |
1733 group=default, |
1732 height=1, |
1734 height=1, |
1733 label=21, |
1735 label=21, |
1734 pin=true, |
1736 pin=true, |
1735 pos="1,21!", |
1737 pos="1,21!", |
1736 shape=pentagon, |
1738 shape=pentagon, |
1737 style=filled, |
1739 style=filled, |
1738 width=1]; |
1740 width=1]; |
1739 18 -> 21 [arrowhead=none, |
1741 18 -> 21 [arrowhead=none, |
1740 penwidth=2.0]; |
1742 penwidth=2.0]; |
1741 20 [fillcolor="#7F7FFF", |
1743 20 [fillcolor="#7F7FFF", |
1742 fixedsize=true, |
1744 fixedsize=true, |
1743 group=default, |
1745 group=default, |
1744 height=1, |
1746 height=1, |
1745 label=20, |
1747 label=20, |
1746 pin=true, |
1748 pin=true, |
1747 pos="1,20!", |
1749 pos="1,20!", |
1748 shape=pentagon, |
1750 shape=pentagon, |
1749 style=filled, |
1751 style=filled, |
1750 width=1]; |
1752 width=1]; |
1751 19 -> 20 [arrowhead=none, |
1753 19 -> 20 [arrowhead=none, |
1752 penwidth=2.0]; |
1754 penwidth=2.0]; |
1753 } |
1755 } |
1754 #endif |
1756 #endif |
1755 |
1757 |
1756 $ hg up t4 |
1758 $ hg up t4 |
1757 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1759 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1809 adding manifests |
1811 adding manifests |
1810 adding file changes |
1812 adding file changes |
1811 added 4 changesets with 4 changes to 1 files (+1 heads) |
1813 added 4 changesets with 4 changes to 1 files (+1 heads) |
1812 8 new obsolescence markers |
1814 8 new obsolescence markers |
1813 |
1815 |
1814 Pushing the new topic branch to a non publishing server did not require |
1816 Pushing the new topic branch to a non-publishing server did not require |
1815 --force. As long as new heads are on their own topic, Mercurial will not |
1817 --force. As long as new heads are on their own topic, Mercurial will not |
1816 complain about them. |
1818 complain about them. |
1817 |
1819 |
1818 From another client, we will get them with their topic: |
1820 From another client, we will get them with their topic: |
1819 |
1821 |