hgbook

view en/figs/bad-merge-4.dot @ 1104:eafa27cb18eb

2.8.1 2 paras zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 25 22:54:30 2009 -0500 (2009-11-25)
parents
children
line source
1 digraph bad_merge_4 {
2 ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
3 left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
4 right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
5 bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
6 new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
8 bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box];
9 bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box];
10 good [label="8: merge\nof backouts",shape=box];
12 ancestor -> left [color="#bbbbbb"];
13 ancestor -> right [color="#bbbbbb"];
14 left -> bad [color="#bbbbbb"];
15 right -> bad [color="#bbbbbb"];
16 bad -> new [color="#bbbbbb"];
18 bad -> bak_left [color=grey];
19 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
21 bad -> bak_right [color=grey];
22 right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
24 bak_left -> good;
25 bak_right -> good;
26 }