Mercurial > hgbook
comparison ja/figs/bad-merge-5.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-5.dot@7226e5e750a6 |
children |
comparison
equal
deleted
inserted
replaced
835:8a3041e6f3cb | 836:d819bc2414f4 |
---|---|
1 digraph bad_merge_5 { | |
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=grey,fontcolor=grey]; | |
7 | |
8 bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box]; | |
9 bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box]; | |
10 good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box]; | |
11 last [label="9: merge with\nnew change",shape=box]; | |
12 | |
13 ancestor -> left [color="#bbbbbb"]; | |
14 ancestor -> right [color="#bbbbbb"]; | |
15 left -> bad [color="#bbbbbb"]; | |
16 right -> bad [color="#bbbbbb"]; | |
17 bad -> new [color="#bbbbbb"]; | |
18 | |
19 bad -> bak_left [color="#bbbbbb"]; | |
20 left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"]; | |
21 | |
22 bad -> bak_right [color="#bbbbbb"]; | |
23 right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"]; | |
24 | |
25 bak_left -> good [color=grey]; | |
26 bak_right -> good [color=grey]; | |
27 | |
28 good -> last; | |
29 new -> last; | |
30 } |