Mercurial > evolve
diff tests/test-tutorial.t @ 3287:4303a46b4167 mercurial-4.3
test-compat: merge stable into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 11 Dec 2017 16:32:03 +0100 |
| parents | a867d59ea97a f0f4cc2febac |
| children | b714709afe6a 85cdce113c2c |
line wrap: on
line diff
--- a/tests/test-tutorial.t Mon Dec 11 16:12:38 2017 +0100 +++ b/tests/test-tutorial.t Mon Dec 11 16:32:03 2017 +0100 @@ -311,17 +311,17 @@ width=0.5]; 0 -> 1 [arrowhead=none, penwidth=2.0]; - 3 [fillcolor="#9999FF", + 4 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=3, + label=4, pin=true, - pos="1,3!", + pos="1,4!", shape=pentagon, style=filled, width=0.5]; - 1 -> 3 [arrowhead=none, + 1 -> 4 [arrowhead=none, penwidth=2.0]; } #endif @@ -366,7 +366,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - new changesets 9ca060c80d74 (run 'hg heads' to see heads, 'hg merge' to merge) I now have a new head. Note that this remote head is immutable. @@ -412,6 +411,18 @@ width=0.5]; 0 -> 1 [arrowhead=none, penwidth=2.0]; + 5 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=5, + pin=true, + pos="1,5!", + shape=circle, + style=filled, + width=0.5]; + 0 -> 5 [arrowhead=none, + penwidth=2.0]; 4 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -419,22 +430,10 @@ label=4, pin=true, pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; - 3 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=3, - pin=true, - pos="1,3!", shape=pentagon, style=filled, width=0.5]; - 1 -> 3 [arrowhead=none, + 1 -> 4 [arrowhead=none, penwidth=2.0]; } #endif @@ -445,7 +444,7 @@ $ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023 rebasing 1:4d5dc8187023 "adding condiment" merging shopping - rebasing 3:9d0363b81950 "adding fruit" + rebasing 4:9d0363b81950 "adding fruit" merging shopping @@ -479,18 +478,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -498,10 +485,10 @@ label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -515,6 +502,18 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; + 7 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=7, + pin=true, + pos="1,7!", + shape=pentagon, + style=filled, + width=0.5]; + 6 -> 7 [arrowhead=none, + penwidth=2.0]; } #endif @@ -581,18 +580,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -600,10 +587,10 @@ label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -617,6 +604,18 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; + 7 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=7, + pin=true, + pos="1,7!", + shape=pentagon, + style=filled, + width=0.5]; + 6 -> 7 [arrowhead=none, + penwidth=2.0]; } #endif @@ -665,7 +664,7 @@ $ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg grab fac207dec9f5 # moving "SPAM SPAM" to the working directory parent - rebasing 9:fac207dec9f5 "SPAM SPAM" (tip) + rebasing 10:fac207dec9f5 "SPAM SPAM" (tip) merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg log -G @@ -701,18 +700,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -720,10 +707,10 @@ label=5, pin=true, pos="1,5!", - shape=pentagon, + shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -737,29 +724,41 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 8 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=8, + label=7, pin=true, - pos="1,8!", + pos="1,7!", shape=pentagon, style=filled, width=0.5]; - 6 -> 8 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 9 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=9, pin=true, - pos="1,10!", + pos="1,9!", shape=pentagon, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 7 -> 9 [arrowhead=none, + penwidth=2.0]; + 11 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=11, + pin=true, + pos="1,11!", + shape=pentagon, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, penwidth=2.0]; } #endif @@ -803,12 +802,12 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files - 5 new obsolescence markers + 6 new obsolescence markers for simplicity sake we get the bathroom change in line again $ hg grab 10b8aeaa8cc8 - rebasing 8:10b8aeaa8cc8 "bathroom stuff" + rebasing 9:10b8aeaa8cc8 "bathroom stuff" merging shopping ? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob) $ hg phase --draft . @@ -845,18 +844,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -867,7 +854,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -881,17 +868,17 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; 11 [fillcolor="#9999FF", fixedsize=true, @@ -900,10 +887,22 @@ label=11, pin=true, pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 12 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=12, + pin=true, + pos="1,12!", shape=pentagon, style=filled, width=0.5]; - 10 -> 11 [arrowhead=none, + 11 -> 12 [arrowhead=none, penwidth=2.0]; } #endif @@ -1015,7 +1014,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 75954b8cd933 (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (public): bathroom stuff @@ -1071,7 +1069,6 @@ adding file changes added 1 changesets with 1 changes to 1 files 1 new obsolescence markers - new changesets 75954b8cd933 (run 'hg update' to get a working copy) $ hg log -G o 75954b8cd933 (draft): bathroom stuff @@ -1140,18 +1137,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1162,7 +1147,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1176,29 +1161,41 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 11 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=11, pin=true, - pos="1,12!", + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 14 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=14, + pin=true, + pos="1,14!", shape=pentagon, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 11 -> 14 [arrowhead=none, penwidth=2.0]; } #endif @@ -1211,10 +1208,9 @@ adding changesets adding manifests adding file changes - added 1 changesets with 1 changes to 1 files - new changesets bf1b0d202029 - (run 'hg update' to get a working copy) - 1 new orphan changesets + added 1 changesets with 1 changes to 1 files (+1 heads) + (run 'hg heads' to see heads, 'hg merge' to merge) + 1 new unstable changesets The new changeset "animal" is based on an old changeset of "bathroom". You can @@ -1257,18 +1253,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1279,7 +1263,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1293,57 +1277,69 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 11 [fillcolor="#DFDFFF", + 11 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=11, + pin=true, + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 12 [fillcolor="#DFDFFF", fixedsize=true, group=default_alt, height=0.5, - label=11, + label=12, pin=true, - pos="2,11!", + pos="2,12!", shape=pentagon, style="dotted, filled", width=0.5]; - 10 -> 11 [arrowhead=none, + 11 -> 12 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 14 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=14, pin=true, - pos="1,12!", + pos="1,14!", shape=pentagon, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 11 -> 14 [arrowhead=none, penwidth=2.0]; - 11 -> 12 [arrowhead=none, + 12 -> 14 [arrowhead=none, minlen=0, penwidth=2.0, style=dashed]; - 13 [fillcolor="#FF4F4F", + 15 [fillcolor="#FF4F4F", fixedsize=true, group=default_alt, height=0.5, - label=13, + label=15, pin=true, - pos="2,13!", + pos="2,15!", shape=pentagon, style=filled, width=0.5]; - 11 -> 13 [arrowhead=none, + 12 -> 15 [arrowhead=none, penwidth=2.0]; } #endif @@ -1359,7 +1355,7 @@ $ hg push other pushing to $TESTTMP/other (glob) searching for changes - abort: push includes orphan changeset: bf1b0d202029! + abort: push includes unstable changeset: bf1b0d202029! (use 'hg evolve' to get a stable history or --force to ignore warnings) [255] @@ -1370,15 +1366,15 @@ It has a --dry-run option to only suggest the next move. $ hg evolve --dry-run - move:[13] animals - atop:[12] bathroom stuff + move:[15] animals + atop:[14] bathroom stuff hg rebase -r bf1b0d202029 -d a44c85f957d3 Let's do it $ hg evolve - move:[13] animals - atop:[12] bathroom stuff + move:[15] animals + atop:[14] bathroom stuff merging shopping working directory is now at ee942144f952 @@ -1419,18 +1415,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1441,7 +1425,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1455,29 +1439,29 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 11 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=11, pin=true, - pos="1,12!", - shape=pentagon, + pos="1,11!", + shape=circle, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 7 -> 11 [arrowhead=none, penwidth=2.0]; 14 [fillcolor="#9999FF", fixedsize=true, @@ -1489,7 +1473,19 @@ shape=pentagon, style=filled, width=0.5]; - 12 -> 14 [arrowhead=none, + 11 -> 14 [arrowhead=none, + penwidth=2.0]; + 16 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=16, + pin=true, + pos="1,16!", + shape=pentagon, + style=filled, + width=0.5]; + 14 -> 16 [arrowhead=none, penwidth=2.0]; } #endif @@ -1503,7 +1499,7 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) - 2 new obsolescence markers + 3 new obsolescence markers obsoleted 2 changesets Remote get a warning that current working directory is based on an obsolete @@ -1546,7 +1542,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - new changesets 99f039c5ec9e (run 'hg update' to get a working copy) $ hg log -G o 99f039c5ec9e (draft): SPAM SPAM SPAM @@ -1585,18 +1580,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1607,7 +1590,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1621,29 +1604,29 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 11 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=11, pin=true, - pos="1,12!", - shape=pentagon, + pos="1,11!", + shape=circle, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 7 -> 11 [arrowhead=none, penwidth=2.0]; 14 [fillcolor="#9999FF", fixedsize=true, @@ -1655,19 +1638,31 @@ shape=pentagon, style=filled, width=0.5]; - 12 -> 14 [arrowhead=none, + 11 -> 14 [arrowhead=none, penwidth=2.0]; - 15 [fillcolor="#9999FF", + 16 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=15, + label=16, pin=true, - pos="1,15!", + pos="1,16!", shape=pentagon, style=filled, width=0.5]; - 14 -> 15 [arrowhead=none, + 14 -> 16 [arrowhead=none, + penwidth=2.0]; + 17 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=17, + pin=true, + pos="1,17!", + shape=pentagon, + style=filled, + width=0.5]; + 16 -> 17 [arrowhead=none, penwidth=2.0]; } #endif @@ -1678,7 +1673,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved working directory now at a44c85f957d3 1 changesets pruned - 1 new orphan changesets + 1 new unstable changesets The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset @@ -1721,18 +1716,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1743,7 +1726,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1757,53 +1740,65 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 11 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=11, pin=true, - pos="1,12!", + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 14 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=14, + pin=true, + pos="1,14!", shape=pentagon, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 11 -> 14 [arrowhead=none, penwidth=2.0]; - 14 [fillcolor="#DFDFFF", + 16 [fillcolor="#DFDFFF", fixedsize=true, group=default_alt, height=0.5, - label=14, + label=16, pin=true, - pos="2,14!", + pos="2,16!", shape=pentagon, style="dotted, filled", width=0.5]; - 12 -> 14 [arrowhead=none, + 14 -> 16 [arrowhead=none, penwidth=2.0]; - 15 [fillcolor="#FF4F4F", + 17 [fillcolor="#FF4F4F", fixedsize=true, group=default_alt, height=0.5, - label=15, + label=17, pin=true, - pos="2,15!", + pos="2,17!", shape=pentagon, style=filled, width=0.5]; - 14 -> 15 [arrowhead=none, + 16 -> 17 [arrowhead=none, penwidth=2.0]; } #endif @@ -1820,13 +1815,13 @@ splines=polyline ]; node [label="\N"]; - 15 [fillcolor="#FF4F4F", + 17 [fillcolor="#FF4F4F", fixedsize=true, group=default_alt, height=0.5, - label=15, + label=17, pin=true, - pos="1,15!", + pos="1,17!", shape=pentagon, style=filled, width=0.5]; @@ -1834,8 +1829,8 @@ #endif $ hg evolve - move:[15] SPAM SPAM SPAM - atop:[12] bathroom stuff + move:[17] SPAM SPAM SPAM + atop:[14] bathroom stuff merging shopping working directory is now at 40aa40daeefb @@ -1874,18 +1869,6 @@ shape=circle, style=filled, width=0.5]; - 4 [fillcolor="#9999FF", - fixedsize=true, - group=default, - height=0.5, - label=4, - pin=true, - pos="1,4!", - shape=circle, - style=filled, - width=0.5]; - 0 -> 4 [arrowhead=none, - penwidth=2.0]; 5 [fillcolor="#9999FF", fixedsize=true, group=default, @@ -1896,7 +1879,7 @@ shape=circle, style=filled, width=0.5]; - 4 -> 5 [arrowhead=none, + 0 -> 5 [arrowhead=none, penwidth=2.0]; 6 [fillcolor="#9999FF", fixedsize=true, @@ -1910,41 +1893,53 @@ width=0.5]; 5 -> 6 [arrowhead=none, penwidth=2.0]; - 10 [fillcolor="#9999FF", + 7 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=10, + label=7, pin=true, - pos="1,10!", + pos="1,7!", shape=circle, style=filled, width=0.5]; - 6 -> 10 [arrowhead=none, + 6 -> 7 [arrowhead=none, penwidth=2.0]; - 12 [fillcolor="#9999FF", + 11 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=12, + label=11, pin=true, - pos="1,12!", + pos="1,11!", + shape=circle, + style=filled, + width=0.5]; + 7 -> 11 [arrowhead=none, + penwidth=2.0]; + 14 [fillcolor="#9999FF", + fixedsize=true, + group=default, + height=0.5, + label=14, + pin=true, + pos="1,14!", shape=pentagon, style=filled, width=0.5]; - 10 -> 12 [arrowhead=none, + 11 -> 14 [arrowhead=none, penwidth=2.0]; - 16 [fillcolor="#9999FF", + 18 [fillcolor="#9999FF", fixedsize=true, group=default, height=0.5, - label=16, + label=18, pin=true, - pos="1,16!", + pos="1,18!", shape=pentagon, style=filled, width=0.5]; - 12 -> 16 [arrowhead=none, + 14 -> 18 [arrowhead=none, penwidth=2.0]; } #endif