diff tests/test-topic-tutorial.t @ 3438:52440d67921c

branching: merge with tutorial output update

--- a/tests/test-topic-tutorial.t	Sat Jan 20 12:17:06 2018 +0100
+++ b/tests/test-topic-tutorial.t	Sat Jan 20 12:44:02 2018 +0100
@@ -912,140 +912,140 @@
   .. graphviz::
   
       strict digraph "Mercurial graph" {
-          graph [rankdir=LR,
-              splines=polyline
-          ];
-          node [label="\N"];
-          0     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=0,
-              pin=true,
-              pos="1,0!",
-              shape=circle,
-              style=filled,
-              width=1];
-          3     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=3,
-              pin=true,
-              pos="1,3!",
-              shape=circle,
-              style=filled,
-              width=1];
-          0 -> 3     [arrowhead=none,
-              penwidth=2.0];
-          4     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=4,
-              pin=true,
-              pos="1,4!",
-              shape=circle,
-              style=filled,
-              width=1];
-          3 -> 4     [arrowhead=none,
-              penwidth=2.0];
-          5     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=5,
-              pin=true,
-              pos="1,5!",
-              shape=circle,
-              style=filled,
-              width=1];
-          4 -> 5     [arrowhead=none,
-              penwidth=2.0];
-          6     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=6,
-              pin=true,
-              pos="1,6!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          5 -> 6     [arrowhead=none,
-              penwidth=2.0];
-          9     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=9,
-              pin=true,
-              pos="1,9!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          5 -> 9     [arrowhead=none,
-              penwidth=2.0];
-          11     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=11,
-              pin=true,
-              pos="1,11!",
-              shape=circle,
-              style=filled,
-              width=1];
-          5 -> 11     [arrowhead=none,
-              penwidth=2.0];
-          7     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=7,
-              pin=true,
-              pos="1,7!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          6 -> 7     [arrowhead=none,
-              penwidth=2.0];
-          8     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=8,
-              pin=true,
-              pos="1,8!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          7 -> 8     [arrowhead=none,
-              penwidth=2.0];
-          10     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=10,
-              pin=true,
-              pos="1,10!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          9 -> 10     [arrowhead=none,
-              penwidth=2.0];
-          12     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=12,
-              pin=true,
-              pos="1,12!",
-              shape=circle,
-              style=filled,
-              width=1];
-          11 -> 12     [arrowhead=none,
-              penwidth=2.0];
+      	graph [rankdir=LR,
+      		splines=polyline
+      	];
+      	node [label="\N"];
+      	0	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=0,
+      		pin=true,
+      		pos="1,0!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	3	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=3,
+      		pin=true,
+      		pos="1,3!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	0 -> 3	 [arrowhead=none,
+      		penwidth=2.0];
+      	4	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=4,
+      		pin=true,
+      		pos="1,4!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	3 -> 4	 [arrowhead=none,
+      		penwidth=2.0];
+      	5	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=5,
+      		pin=true,
+      		pos="1,5!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	4 -> 5	 [arrowhead=none,
+      		penwidth=2.0];
+      	6	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=6,
+      		pin=true,
+      		pos="1,6!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	5 -> 6	 [arrowhead=none,
+      		penwidth=2.0];
+      	9	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=9,
+      		pin=true,
+      		pos="1,9!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	5 -> 9	 [arrowhead=none,
+      		penwidth=2.0];
+      	11	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=11,
+      		pin=true,
+      		pos="1,11!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	5 -> 11	 [arrowhead=none,
+      		penwidth=2.0];
+      	7	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=7,
+      		pin=true,
+      		pos="1,7!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	6 -> 7	 [arrowhead=none,
+      		penwidth=2.0];
+      	8	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=8,
+      		pin=true,
+      		pos="1,8!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	7 -> 8	 [arrowhead=none,
+      		penwidth=2.0];
+      	10	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=10,
+      		pin=true,
+      		pos="1,10!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	9 -> 10	 [arrowhead=none,
+      		penwidth=2.0];
+      	12	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=12,
+      		pin=true,
+      		pos="1,12!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	11 -> 12	 [arrowhead=none,
+      		penwidth=2.0];
       }
 #endif
 
@@ -1255,97 +1255,97 @@
   .. graphviz::
   
       strict digraph "Mercurial graph" {
-          graph [rankdir=LR,
-              splines=polyline
-          ];
-          node [label="\N"];
-          12     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=12,
-              pin=true,
-              pos="1,12!",
-              shape=circle,
-              style=filled,
-              width=1];
-          13     [fillcolor="#DFDFFF",
-              fixedsize=true,
-              group=default_alt,
-              height=1,
-              label=13,
-              pin=true,
-              pos="2,13!",
-              shape=pentagon,
-              style="dotted, filled",
-              width=1];
-          12 -> 13     [arrowhead=none,
-              penwidth=2.0];
-          18     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=18,
-              pin=true,
-              pos="1,18!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          12 -> 18     [arrowhead=none,
-              penwidth=2.0];
-          16     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=16,
-              pin=true,
-              pos="1,16!",
-              shape=circle,
-              style=filled,
-              width=1];
-          12 -> 16     [arrowhead=none,
-              penwidth=2.0];
-          13 -> 18     [arrowtail=none,
-              dir=back,
-              minlen=0,
-              penwidth=2.0,
-              style=dashed];
-          14     [fillcolor="#FF4F4F",
-              fixedsize=true,
-              group=default_alt,
-              height=1,
-              label=14,
-              pin=true,
-              pos="2,14!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          13 -> 14     [arrowhead=none,
-              penwidth=2.0];
-          15     [fillcolor="#FF4F4F",
-              fixedsize=true,
-              group=default_alt,
-              height=1,
-              label=15,
-              pin=true,
-              pos="2,15!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          14 -> 15     [arrowhead=none,
-              penwidth=2.0];
-          17     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=17,
-              pin=true,
-              pos="1,17!",
-              shape=circle,
-              style=filled,
-              width=1];
-          16 -> 17     [arrowhead=none,
-              penwidth=2.0];
+      	graph [rankdir=LR,
+      		splines=polyline
+      	];
+      	node [label="\N"];
+      	12	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=12,
+      		pin=true,
+      		pos="1,12!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	13	 [fillcolor="#DFDFFF",
+      		fixedsize=true,
+      		group=default_alt,
+      		height=1,
+      		label=13,
+      		pin=true,
+      		pos="2,13!",
+      		shape=pentagon,
+      		style="dotted, filled",
+      		width=1];
+      	12 -> 13	 [arrowhead=none,
+      		penwidth=2.0];
+      	18	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=18,
+      		pin=true,
+      		pos="1,18!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	12 -> 18	 [arrowhead=none,
+      		penwidth=2.0];
+      	16	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=16,
+      		pin=true,
+      		pos="1,16!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	12 -> 16	 [arrowhead=none,
+      		penwidth=2.0];
+      	13 -> 18	 [arrowtail=none,
+      		dir=back,
+      		minlen=0,
+      		penwidth=2.0,
+      		style=dashed];
+      	14	 [fillcolor="#FF4F4F",
+      		fixedsize=true,
+      		group=default_alt,
+      		height=1,
+      		label=14,
+      		pin=true,
+      		pos="2,14!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	13 -> 14	 [arrowhead=none,
+      		penwidth=2.0];
+      	15	 [fillcolor="#FF4F4F",
+      		fixedsize=true,
+      		group=default_alt,
+      		height=1,
+      		label=15,
+      		pin=true,
+      		pos="2,15!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	14 -> 15	 [arrowhead=none,
+      		penwidth=2.0];
+      	17	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=17,
+      		pin=true,
+      		pos="1,17!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	16 -> 17	 [arrowhead=none,
+      		penwidth=2.0];
       }
 #endif
 
@@ -1436,80 +1436,80 @@
   .. graphviz::
   
       strict digraph "Mercurial graph" {
-          graph [rankdir=LR,
-              splines=polyline
-          ];
-          node [label="\N"];
-          12     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=12,
-              pin=true,
-              pos="1,12!",
-              shape=circle,
-              style=filled,
-              width=1];
-          16     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=16,
-              pin=true,
-              pos="1,16!",
-              shape=circle,
-              style=filled,
-              width=1];
-          12 -> 16     [arrowhead=none,
-              penwidth=2.0];
-          18     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=18,
-              pin=true,
-              pos="1,18!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          12 -> 18     [arrowhead=none,
-              penwidth=2.0];
-          17     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=17,
-              pin=true,
-              pos="1,17!",
-              shape=circle,
-              style=filled,
-              width=1];
-          16 -> 17     [arrowhead=none,
-              penwidth=2.0];
-          19     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=19,
-              pin=true,
-              pos="1,19!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          18 -> 19     [arrowhead=none,
-              penwidth=2.0];
-          20     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=20,
-              pin=true,
-              pos="1,20!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          19 -> 20     [arrowhead=none,
-              penwidth=2.0];
+      	graph [rankdir=LR,
+      		splines=polyline
+      	];
+      	node [label="\N"];
+      	12	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=12,
+      		pin=true,
+      		pos="1,12!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	16	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=16,
+      		pin=true,
+      		pos="1,16!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	12 -> 16	 [arrowhead=none,
+      		penwidth=2.0];
+      	18	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=18,
+      		pin=true,
+      		pos="1,18!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	12 -> 18	 [arrowhead=none,
+      		penwidth=2.0];
+      	17	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=17,
+      		pin=true,
+      		pos="1,17!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	16 -> 17	 [arrowhead=none,
+      		penwidth=2.0];
+      	19	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=19,
+      		pin=true,
+      		pos="1,19!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	18 -> 19	 [arrowhead=none,
+      		penwidth=2.0];
+      	20	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=20,
+      		pin=true,
+      		pos="1,20!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	19 -> 20	 [arrowhead=none,
+      		penwidth=2.0];
       }
 #endif
 Multi-headed stack
@@ -1618,152 +1618,152 @@
   .. graphviz::
   
       strict digraph "Mercurial graph" {
-          graph [rankdir=LR,
-              splines=polyline
-          ];
-          node [label="\N"];
-          0     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=0,
-              pin=true,
-              pos="1,0!",
-              shape=circle,
-              style=filled,
-              width=1];
-          3     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=3,
-              pin=true,
-              pos="1,3!",
-              shape=circle,
-              style=filled,
-              width=1];
-          0 -> 3     [arrowhead=none,
-              penwidth=2.0];
-          4     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=4,
-              pin=true,
-              pos="1,4!",
-              shape=circle,
-              style=filled,
-              width=1];
-          3 -> 4     [arrowhead=none,
-              penwidth=2.0];
-          5     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=5,
-              pin=true,
-              pos="1,5!",
-              shape=circle,
-              style=filled,
-              width=1];
-          4 -> 5     [arrowhead=none,
-              penwidth=2.0];
-          11     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=11,
-              pin=true,
-              pos="1,11!",
-              shape=circle,
-              style=filled,
-              width=1];
-          5 -> 11     [arrowhead=none,
-              penwidth=2.0];
-          12     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=12,
-              pin=true,
-              pos="1,12!",
-              shape=circle,
-              style=filled,
-              width=1];
-          11 -> 12     [arrowhead=none,
-              penwidth=2.0];
-          16     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=16,
-              pin=true,
-              pos="1,16!",
-              shape=circle,
-              style=filled,
-              width=1];
-          12 -> 16     [arrowhead=none,
-              penwidth=2.0];
-          18     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=18,
-              pin=true,
-              pos="1,18!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          12 -> 18     [arrowhead=none,
-              penwidth=2.0];
-          17     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=17,
-              pin=true,
-              pos="1,17!",
-              shape=circle,
-              style=filled,
-              width=1];
-          16 -> 17     [arrowhead=none,
-              penwidth=2.0];
-          19     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=19,
-              pin=true,
-              pos="1,19!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          18 -> 19     [arrowhead=none,
-              penwidth=2.0];
-          21     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=21,
-              pin=true,
-              pos="1,21!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          18 -> 21     [arrowhead=none,
-              penwidth=2.0];
-          20     [fillcolor="#7F7FFF",
-              fixedsize=true,
-              group=default,
-              height=1,
-              label=20,
-              pin=true,
-              pos="1,20!",
-              shape=pentagon,
-              style=filled,
-              width=1];
-          19 -> 20     [arrowhead=none,
-              penwidth=2.0];
+      	graph [rankdir=LR,
+      		splines=polyline
+      	];
+      	node [label="\N"];
+      	0	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=0,
+      		pin=true,
+      		pos="1,0!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	3	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=3,
+      		pin=true,
+      		pos="1,3!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	0 -> 3	 [arrowhead=none,
+      		penwidth=2.0];
+      	4	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=4,
+      		pin=true,
+      		pos="1,4!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	3 -> 4	 [arrowhead=none,
+      		penwidth=2.0];
+      	5	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=5,
+      		pin=true,
+      		pos="1,5!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	4 -> 5	 [arrowhead=none,
+      		penwidth=2.0];
+      	11	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=11,
+      		pin=true,
+      		pos="1,11!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	5 -> 11	 [arrowhead=none,
+      		penwidth=2.0];
+      	12	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=12,
+      		pin=true,
+      		pos="1,12!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	11 -> 12	 [arrowhead=none,
+      		penwidth=2.0];
+      	16	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=16,
+      		pin=true,
+      		pos="1,16!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	12 -> 16	 [arrowhead=none,
+      		penwidth=2.0];
+      	18	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=18,
+      		pin=true,
+      		pos="1,18!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	12 -> 18	 [arrowhead=none,
+      		penwidth=2.0];
+      	17	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=17,
+      		pin=true,
+      		pos="1,17!",
+      		shape=circle,
+      		style=filled,
+      		width=1];
+      	16 -> 17	 [arrowhead=none,
+      		penwidth=2.0];
+      	19	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=19,
+      		pin=true,
+      		pos="1,19!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	18 -> 19	 [arrowhead=none,
+      		penwidth=2.0];
+      	21	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=21,
+      		pin=true,
+      		pos="1,21!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	18 -> 21	 [arrowhead=none,
+      		penwidth=2.0];
+      	20	 [fillcolor="#7F7FFF",
+      		fixedsize=true,
+      		group=default,
+      		height=1,
+      		label=20,
+      		pin=true,
+      		pos="1,20!",
+      		shape=pentagon,
+      		style=filled,
+      		width=1];
+      	19 -> 20	 [arrowhead=none,
+      		penwidth=2.0];
       }
 #endif