bos@680: digraph bad_merge_5 { bos@680: ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: new [label="5: new change",color=grey,fontcolor=grey]; bos@680: bos@680: bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box]; bos@680: bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box]; bos@680: good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box]; bos@680: last [label="9: merge with\nnew change",shape=box]; bos@680: bos@680: ancestor -> left [color="#bbbbbb"]; bos@680: ancestor -> right [color="#bbbbbb"]; bos@680: left -> bad [color="#bbbbbb"]; bos@680: right -> bad [color="#bbbbbb"]; bos@680: bad -> new [color="#bbbbbb"]; bos@680: bos@680: bad -> bak_left [color="#bbbbbb"]; bos@680: left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: bos@680: bad -> bak_right [color="#bbbbbb"]; bos@680: right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"]; bos@680: bos@680: bak_left -> good [color=grey]; bos@680: bak_right -> good [color=grey]; bos@680: bos@680: good -> last; bos@680: new -> last; bos@680: }