annotate fr/figs/bad-merge-3.dot @ 1013:44946b10a4b3
merge with André Sintzoff
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Tue Nov 24 11:44:49 2009 +0100 (2009-11-24) |
| parents |
7226e5e750a6 |
| children |
|
| rev |
line source |
|
bos@680
|
1 digraph bad_merge_3 {
|
|
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="#bbbbbb",fontcolor="#bbbbbb"];
|
|
bos@680
|
7
|
|
bos@680
|
8 bak_left [label="6: backout 1 of\nbad merge",color=grey,shape=box];
|
|
bos@680
|
9 bak_right [label="8: backout 2 of\nbad merge",shape=box];
|
|
bos@680
|
10
|
|
bos@680
|
11 ancestor -> left [color="#bbbbbb"];
|
|
bos@680
|
12 ancestor -> right [color="#bbbbbb"];
|
|
bos@680
|
13 left -> bad [color="#bbbbbb"];
|
|
bos@680
|
14 right -> bad [color="#bbbbbb"];
|
|
bos@680
|
15 bad -> new [color="#bbbbbb"];
|
|
bos@680
|
16
|
|
bos@680
|
17 bad -> bak_left [color=grey];
|
|
bos@680
|
18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
|
|
bos@680
|
19
|
|
bos@680
|
20 bad -> bak_right;
|
|
bos@680
|
21 right -> bak_right [style=dotted,label="--parent=3"];
|
|
bos@680
|
22 }
|
