1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/figs/bad-merge-5.dot	Sun Apr 26 23:23:06 2009 -0700
     1.3 @@ -0,0 +1,30 @@
     1.4 +digraph bad_merge_5 {
     1.5 +	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.6 +	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.7 +	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.8 +	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
     1.9 +	new [label="5: new change",color=grey,fontcolor=grey];
    1.10 +
    1.11 +	bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
    1.12 +	bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
    1.13 +	good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box];
    1.14 +	last [label="9: merge with\nnew change",shape=box];
    1.15 +
    1.16 +	ancestor -> left [color="#bbbbbb"];
    1.17 +	ancestor -> right [color="#bbbbbb"];
    1.18 +	left -> bad [color="#bbbbbb"];
    1.19 +	right -> bad [color="#bbbbbb"];
    1.20 +	bad -> new [color="#bbbbbb"];
    1.21 +
    1.22 +	bad -> bak_left [color="#bbbbbb"];
    1.23 +	left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
    1.24 +
    1.25 +	bad -> bak_right [color="#bbbbbb"];
    1.26 +	right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
    1.27 +
    1.28 +	bak_left -> good [color=grey];
    1.29 +	bak_right -> good [color=grey];
    1.30 +
    1.31 +	good -> last;
    1.32 +	new -> last;
    1.33 +}