annotate it/figs/bad-merge-4.dot @ 996:6f8c48362758
merge with trunk
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Sat Sep 12 17:58:56 2009 +0200 (2009-09-12) |
| parents |
713f0f69029a 793e15b562ef |
| children |
|
| rev |
line source |
|
Giulio@832
|
1 digraph bad_merge_4 {
|
|
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,fontcolor=grey,shape=box];
|
|
Giulio@832
|
9 bak_right [label="7: ritiro n°2 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
|
|
Giulio@832
|
10 good [label="8: unione\ndei ritiri",shape=box];
|
|
Giulio@832
|
11
|
|
Giulio@832
|
12 ancestor -> left [color="#bbbbbb"];
|
|
Giulio@832
|
13 ancestor -> right [color="#bbbbbb"];
|
|
Giulio@832
|
14 left -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
15 right -> bad [color="#bbbbbb"];
|
|
Giulio@832
|
16 bad -> new [color="#bbbbbb"];
|
|
Giulio@832
|
17
|
|
Giulio@832
|
18 bad -> bak_left [color=grey];
|
|
Giulio@832
|
19 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
|
|
Giulio@832
|
20
|
|
Giulio@832
|
21 bad -> bak_right [color=grey];
|
|
Giulio@832
|
22 right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
|
|
Giulio@832
|
23
|
|
Giulio@832
|
24 bak_left -> good;
|
|
Giulio@832
|
25 bak_right -> good;
|
|
Giulio@832
|
26 }
|
