Mercurial > hgbook
comparison ja/figs/bad-merge-3.dot @ 836:d819bc2414f4
add figs/bad-merge-*.dot.
a part of 7226e5e750a6.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 23 Jul 2009 18:10:58 +0900 |
parents | en/figs/bad-merge-3.dot@7226e5e750a6 |
children |
comparison
equal
deleted
inserted
replaced
835:8a3041e6f3cb | 836:d819bc2414f4 |
---|---|
1 digraph bad_merge_3 { | |
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"]; | |
7 | |
8 bak_left [label="6: backout 1 of\nbad merge",color=grey,shape=box]; | |
9 bak_right [label="8: backout 2 of\nbad merge",shape=box]; | |
10 | |
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"]; | |
16 | |
17 bad -> bak_left [color=grey]; | |
18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey]; | |
19 | |
20 bad -> bak_right; | |
21 right -> bak_right [style=dotted,label="--parent=3"]; | |
22 } |