Mercurial > hgbook
view ja/figs/bad-merge-4.dot @ 838:d1f676a6a4b3 default tip
update mq chapter.
propagate ef53d025f410.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Thu, 03 Dec 2009 01:26:08 +0900 |
parents | d819bc2414f4 |
children |
line wrap: on
line source
digraph bad_merge_4 { ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"]; left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"]; right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"]; bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"]; new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"]; bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box]; bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box]; good [label="8: merge\nof backouts",shape=box]; ancestor -> left [color="#bbbbbb"]; ancestor -> right [color="#bbbbbb"]; left -> bad [color="#bbbbbb"]; right -> bad [color="#bbbbbb"]; bad -> new [color="#bbbbbb"]; bad -> bak_left [color=grey]; left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey]; bad -> bak_right [color=grey]; right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey]; bak_left -> good; bak_right -> good; }