annotate it/figs/bad-merge-3.dot @ 847:b818ec4dd1d2
Minor changes.
| author |
gpiancastelli |
| date |
Sat Aug 22 17:08:09 2009 +0200 (2009-08-22) |
| parents |
ea5ae4dd787b |
| children |
719b03ea27c8 |
| rev |
line source |
|
Giulio@832
|
1 digraph bad_merge_3 {
|
|
gpiancastelli@844
|
2 ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
3 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
4 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
5 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
6 new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
|
|
Giulio@832
|
7
|
|
Giulio@832
|
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,shape=box];
|
|
Giulio@832
|
9 bak_right [label="8: ritiro n°2 della\nunione sbagliata",shape=box];
|
|
Giulio@832
|
10
|
|
Giulio@832
|
11 ancestor -> left [color="#bbbbbb"];
|
|
Giulio@832
|
12 ancestor -> right [color="#bbbbbb"];
|
|
Giulio@832
|
13 left -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
14 right -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
15 bad -> new [color="#bbbbbb"];
|
|
Giulio@832
|
16
|
|
Giulio@832
|
17 bad -> bak_left [color=grey];
|
|
Giulio@832
|
18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
|
|
Giulio@832
|
19
|
|
Giulio@832
|
20 bad -> bak_right;
|
|
Giulio@832
|
21 right -> bak_right [style=dotted,label="--parent=3"];
|
|
Giulio@832
|
22 }
|
