--- a/tests/test-tutorial.t Fri Oct 20 16:07:40 2017 +0200
+++ b/tests/test-tutorial.t Fri Oct 20 19:32:18 2017 +0200
@@ -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
@@ -411,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,
@@ -418,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
@@ -444,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
@@ -478,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,
@@ -497,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,
@@ -514,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
@@ -580,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,
@@ -599,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,
@@ -616,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
@@ -664,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
@@ -700,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,
@@ -719,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,
@@ -736,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
@@ -802,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 .
@@ -844,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,
@@ -866,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,
@@ -880,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,
@@ -899,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
@@ -1135,18 +1135,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,
@@ -1157,7 +1145,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1171,29 +1159,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
@@ -1206,8 +1206,8 @@
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files
- (run 'hg update' to get a working copy)
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
1 new orphan changesets
@@ -1251,18 +1251,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,
@@ -1273,7 +1261,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1287,57 +1275,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
@@ -1364,15 +1364,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
@@ -1413,18 +1413,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,
@@ -1435,7 +1423,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1449,29 +1437,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,
@@ -1483,7 +1471,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
@@ -1497,7 +1497,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
@@ -1578,18 +1578,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,
@@ -1600,7 +1588,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1614,29 +1602,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,
@@ -1648,19 +1636,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
@@ -1714,18 +1714,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,
@@ -1736,7 +1724,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1750,53 +1738,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
@@ -1813,13 +1813,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];
@@ -1827,8 +1827,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
@@ -1867,18 +1867,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,
@@ -1889,7 +1877,7 @@
shape=circle,
style=filled,
width=0.5];
- 4 -> 5 [arrowhead=none,
+ 0 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1903,41 +1891,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