--- a/tests/test-tutorial.t Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-tutorial.t Wed Sep 27 16:26:30 2017 +0200
@@ -311,17 +311,17 @@
width=0.5];
0 -> 1 [arrowhead=none,
penwidth=2.0];
- 4 [fillcolor="#9999FF",
+ 3 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=4,
+ label=3,
pin=true,
- pos="1,4!",
+ pos="1,3!",
shape=pentagon,
style=filled,
width=0.5];
- 1 -> 4 [arrowhead=none,
+ 1 -> 3 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -411,18 +411,6 @@
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,
@@ -430,10 +418,22 @@
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 -> 4 [arrowhead=none,
+ 1 -> 3 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -444,7 +444,7 @@
$ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
rebasing 1:4d5dc8187023 "adding condiment"
merging shopping
- rebasing 4:9d0363b81950 "adding fruit"
+ rebasing 3:9d0363b81950 "adding fruit"
merging shopping
@@ -478,6 +478,18 @@
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,
@@ -485,10 +497,10 @@
label=5,
pin=true,
pos="1,5!",
- shape=circle,
+ shape=pentagon,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -502,18 +514,6 @@
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,6 +580,18 @@
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,
@@ -587,10 +599,10 @@
label=5,
pin=true,
pos="1,5!",
- shape=circle,
+ shape=pentagon,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -604,18 +616,6 @@
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 10:fac207dec9f5 "SPAM SPAM" (tip)
+ rebasing 9:fac207dec9f5 "SPAM SPAM" (tip)
merging shopping
? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
$ hg log -G
@@ -700,6 +700,18 @@
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,
@@ -707,10 +719,10 @@
label=5,
pin=true,
pos="1,5!",
- shape=circle,
+ shape=pentagon,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -724,41 +736,29 @@
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];
- 9 [fillcolor="#9999FF",
+ 8 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=9,
+ label=8,
pin=true,
- pos="1,9!",
+ pos="1,8!",
shape=pentagon,
style=filled,
width=0.5];
- 7 -> 9 [arrowhead=none,
+ 6 -> 8 [arrowhead=none,
penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=11,
+ label=10,
pin=true,
- pos="1,11!",
+ pos="1,10!",
shape=pentagon,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -802,12 +802,12 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- 6 new obsolescence markers
+ 5 new obsolescence markers
for simplicity sake we get the bathroom change in line again
$ hg grab 10b8aeaa8cc8
- rebasing 9:10b8aeaa8cc8 "bathroom stuff"
+ rebasing 8:10b8aeaa8cc8 "bathroom stuff"
merging shopping
? files updated, 0 files merged, 0 files removed, 0 files unresolved (glob)
$ hg phase --draft .
@@ -844,6 +844,18 @@
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,
@@ -854,7 +866,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -868,17 +880,17 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 6 -> 7 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
11 [fillcolor="#9999FF",
fixedsize=true,
@@ -887,22 +899,10 @@
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];
- 11 -> 12 [arrowhead=none,
+ 10 -> 11 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1135,6 +1135,18 @@
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,
@@ -1145,7 +1157,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1159,41 +1171,29 @@
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=circle,
- style=filled,
- width=0.5];
- 6 -> 7 [arrowhead=none,
- penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=11,
+ label=10,
pin=true,
- pos="1,11!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 14 [fillcolor="#9999FF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=14,
+ label=12,
pin=true,
- pos="1,14!",
+ pos="1,12!",
shape=pentagon,
style=filled,
width=0.5];
- 11 -> 14 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1206,9 +1206,9 @@
adding changesets
adding manifests
adding file changes
- 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
+ added 1 changesets with 1 changes to 1 files
+ (run 'hg update' to get a working copy)
+ 1 new orphan changesets
The new changeset "animal" is based on an old changeset of "bathroom". You can
@@ -1251,6 +1251,18 @@
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,
@@ -1261,7 +1273,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1275,69 +1287,57 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 6 -> 7 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 11 [fillcolor="#DFDFFF",
fixedsize=true,
- group=default,
+ group=default_alt,
height=0.5,
label=11,
pin=true,
- pos="1,11!",
- shape=circle,
- style=filled,
+ pos="2,11!",
+ shape=pentagon,
+ style="dotted, filled",
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 10 -> 11 [arrowhead=none,
penwidth=2.0];
- 12 [fillcolor="#DFDFFF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
- group=default_alt,
+ group=default,
height=0.5,
label=12,
pin=true,
- pos="2,12!",
- shape=pentagon,
- style="dotted, filled",
- width=0.5];
- 11 -> 12 [arrowhead=none,
- penwidth=2.0];
- 14 [fillcolor="#9999FF",
- fixedsize=true,
- group=default,
- height=0.5,
- label=14,
- pin=true,
- pos="1,14!",
+ pos="1,12!",
shape=pentagon,
style=filled,
width=0.5];
- 11 -> 14 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
- 12 -> 14 [arrowhead=none,
+ 11 -> 12 [arrowhead=none,
minlen=0,
penwidth=2.0,
style=dashed];
- 15 [fillcolor="#FF4F4F",
+ 13 [fillcolor="#FF4F4F",
fixedsize=true,
group=default_alt,
height=0.5,
- label=15,
+ label=13,
pin=true,
- pos="2,15!",
+ pos="2,13!",
shape=pentagon,
style=filled,
width=0.5];
- 12 -> 15 [arrowhead=none,
+ 11 -> 13 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1353,7 +1353,7 @@
$ hg push other
pushing to $TESTTMP/other (glob)
searching for changes
- abort: push includes unstable changeset: bf1b0d202029!
+ abort: push includes orphan changeset: bf1b0d202029!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
@@ -1364,15 +1364,15 @@
It has a --dry-run option to only suggest the next move.
$ hg evolve --dry-run
- move:[15] animals
- atop:[14] bathroom stuff
+ move:[13] animals
+ atop:[12] bathroom stuff
hg rebase -r bf1b0d202029 -d a44c85f957d3
Let's do it
$ hg evolve
- move:[15] animals
- atop:[14] bathroom stuff
+ move:[13] animals
+ atop:[12] bathroom stuff
merging shopping
working directory is now at ee942144f952
@@ -1413,6 +1413,18 @@
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,
@@ -1423,7 +1435,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1437,29 +1449,29 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 6 -> 7 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=11,
+ label=12,
pin=true,
- pos="1,11!",
- shape=circle,
+ pos="1,12!",
+ shape=pentagon,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
14 [fillcolor="#9999FF",
fixedsize=true,
@@ -1471,19 +1483,7 @@
shape=pentagon,
style=filled,
width=0.5];
- 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,
+ 12 -> 14 [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)
- 3 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 2 changesets
Remote get a warning that current working directory is based on an obsolete
@@ -1578,6 +1578,18 @@
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,
@@ -1588,7 +1600,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1602,29 +1614,29 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 6 -> 7 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=11,
+ label=12,
pin=true,
- pos="1,11!",
- shape=circle,
+ pos="1,12!",
+ shape=pentagon,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
14 [fillcolor="#9999FF",
fixedsize=true,
@@ -1636,31 +1648,19 @@
shape=pentagon,
style=filled,
width=0.5];
- 11 -> 14 [arrowhead=none,
+ 12 -> 14 [arrowhead=none,
penwidth=2.0];
- 16 [fillcolor="#9999FF",
+ 15 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=16,
+ label=15,
pin=true,
- pos="1,16!",
+ pos="1,15!",
shape=pentagon,
style=filled,
width=0.5];
- 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,
+ 14 -> 15 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1671,7 +1671,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at a44c85f957d3
1 changesets pruned
- 1 new unstable changesets
+ 1 new orphan changesets
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
@@ -1714,6 +1714,18 @@
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,
@@ -1724,7 +1736,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1738,74 +1750,62 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 6 -> 7 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 11 [fillcolor="#9999FF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=11,
+ label=12,
pin=true,
- pos="1,11!",
- shape=circle,
+ pos="1,12!",
+ shape=pentagon,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
- 14 [fillcolor="#9999FF",
+ 14 [fillcolor="#DFDFFF",
fixedsize=true,
- group=default,
+ group=default_alt,
height=0.5,
label=14,
pin=true,
- pos="1,14!",
+ pos="2,14!",
shape=pentagon,
- style=filled,
+ style="dotted, filled",
width=0.5];
- 11 -> 14 [arrowhead=none,
+ 12 -> 14 [arrowhead=none,
penwidth=2.0];
- 16 [fillcolor="#DFDFFF",
+ 15 [fillcolor="#FF4F4F",
fixedsize=true,
group=default_alt,
height=0.5,
- label=16,
+ label=15,
pin=true,
- pos="2,16!",
- shape=pentagon,
- style="dotted, filled",
- width=0.5];
- 14 -> 16 [arrowhead=none,
- penwidth=2.0];
- 17 [fillcolor="#FF4F4F",
- fixedsize=true,
- group=default_alt,
- height=0.5,
- label=17,
- pin=true,
- pos="2,17!",
+ pos="2,15!",
shape=pentagon,
style=filled,
width=0.5];
- 16 -> 17 [arrowhead=none,
+ 14 -> 15 [arrowhead=none,
penwidth=2.0];
}
#endif
- $ hg log -r "unstable()"
+ $ hg log -r "orphan()"
99f039c5ec9e (draft): SPAM SPAM SPAM
#if docgraph-ext
- $ hg docgraph -r "unstable()" --sphinx-directive --rankdir LR #rest-ignore
+ $ hg docgraph -r "orphan()" --sphinx-directive --rankdir LR #rest-ignore
.. graphviz::
strict digraph {
@@ -1813,13 +1813,13 @@
splines=polyline
];
node [label="\N"];
- 17 [fillcolor="#FF4F4F",
+ 15 [fillcolor="#FF4F4F",
fixedsize=true,
group=default_alt,
height=0.5,
- label=17,
+ label=15,
pin=true,
- pos="1,17!",
+ pos="1,15!",
shape=pentagon,
style=filled,
width=0.5];
@@ -1827,8 +1827,8 @@
#endif
$ hg evolve
- move:[17] SPAM SPAM SPAM
- atop:[14] bathroom stuff
+ move:[15] SPAM SPAM SPAM
+ atop:[12] bathroom stuff
merging shopping
working directory is now at 40aa40daeefb
@@ -1867,6 +1867,18 @@
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,
@@ -1877,7 +1889,7 @@
shape=circle,
style=filled,
width=0.5];
- 0 -> 5 [arrowhead=none,
+ 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#9999FF",
fixedsize=true,
@@ -1891,53 +1903,41 @@
width=0.5];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 7 [fillcolor="#9999FF",
+ 10 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=7,
+ label=10,
pin=true,
- pos="1,7!",
- shape=circle,
- style=filled,
- width=0.5];
- 6 -> 7 [arrowhead=none,
- penwidth=2.0];
- 11 [fillcolor="#9999FF",
- fixedsize=true,
- group=default,
- height=0.5,
- label=11,
- pin=true,
- pos="1,11!",
+ pos="1,10!",
shape=circle,
style=filled,
width=0.5];
- 7 -> 11 [arrowhead=none,
+ 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 14 [fillcolor="#9999FF",
+ 12 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=14,
+ label=12,
pin=true,
- pos="1,14!",
+ pos="1,12!",
shape=pentagon,
style=filled,
width=0.5];
- 11 -> 14 [arrowhead=none,
+ 10 -> 12 [arrowhead=none,
penwidth=2.0];
- 18 [fillcolor="#9999FF",
+ 16 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=0.5,
- label=18,
+ label=16,
pin=true,
- pos="1,18!",
+ pos="1,16!",
shape=pentagon,
style=filled,
width=0.5];
- 14 -> 18 [arrowhead=none,
+ 12 -> 16 [arrowhead=none,
penwidth=2.0];
}
#endif