| rev |
line source |
|
bos@680
|
1 digraph bad_merge_5 {
|
|
bos@680
|
2 ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
3 left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
4 right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
5 bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
6 new [label="5: new change",color=grey,fontcolor=grey];
|
|
bos@680
|
7
|
|
bos@680
|
8 bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
|
|
bos@680
|
9 bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
|
|
bos@680
|
10 good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box];
|
|
bos@680
|
11 last [label="9: merge with\nnew change",shape=box];
|
|
bos@680
|
12
|
|
bos@680
|
13 ancestor -> left [color="#bbbbbb"];
|
|
bos@680
|
14 ancestor -> right [color="#bbbbbb"];
|
|
bos@680
|
15 left -> bad [color="#bbbbbb"];
|
|
bos@680
|
16 right -> bad [color="#bbbbbb"];
|
|
bos@680
|
17 bad -> new [color="#bbbbbb"];
|
|
bos@680
|
18
|
|
bos@680
|
19 bad -> bak_left [color="#bbbbbb"];
|
|
bos@680
|
20 left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
21
|
|
bos@680
|
22 bad -> bak_right [color="#bbbbbb"];
|
|
bos@680
|
23 right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
24
|
|
bos@680
|
25 bak_left -> good [color=grey];
|
|
bos@680
|
26 bak_right -> good [color=grey];
|
|
bos@680
|
27
|
|
bos@680
|
28 good -> last;
|
|
bos@680
|
29 new -> last;
|
|
bos@680
|
30 }
|
