hgbook

view it/figs/bad-merge-3.dot @ 1024:ea04ebd452b5

French : second part of ch06
author André Sintzoff <andre.sintzoff@gmail.com>
date Thu Dec 03 22:45:38 2009 +0100 (2009-12-03)
parents 713f0f69029a 793e15b562ef
children
line source
1 digraph bad_merge_3 {
2 ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
3 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
4 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
5 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
6 new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,shape=box];
9 bak_right [label="8: ritiro n°2 della\nunione sbagliata",shape=box];
11 ancestor -> left [color="#bbbbbb"];
12 ancestor -> right [color="#bbbbbb"];
13 left -> bad [color="#bbbbbb"];
14 right -> bad [color="#bbbbbb"];
15 bad -> new [color="#bbbbbb"];
17 bad -> bak_left [color=grey];
18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
20 bad -> bak_right;
21 right -> bak_right [style=dotted,label="--parent=3"];
22 }