hgbook
annotate en/figs/bad-merge-4.dot @ 1114:527b86d55d4a
inotify: update installation information
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
inotify is shipped in Mercurial since 1.0, which greatly simplifies the installation process
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Sun Dec 13 16:35:56 2009 +0900 (2009-12-13) |
parents | |
children |
rev | line source |
---|---|
bos@680 | 1 digraph bad_merge_4 { |
bos@680 | 2 ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"]; |
bos@680 | 3 left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"]; |
bos@680 | 4 right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"]; |
bos@680 | 5 bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"]; |
bos@680 | 6 new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"]; |
bos@680 | 7 |
bos@680 | 8 bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box]; |
bos@680 | 9 bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box]; |
bos@680 | 10 good [label="8: merge\nof backouts",shape=box]; |
bos@680 | 11 |
bos@680 | 12 ancestor -> left [color="#bbbbbb"]; |
bos@680 | 13 ancestor -> right [color="#bbbbbb"]; |
bos@680 | 14 left -> bad [color="#bbbbbb"]; |
bos@680 | 15 right -> bad [color="#bbbbbb"]; |
bos@680 | 16 bad -> new [color="#bbbbbb"]; |
bos@680 | 17 |
bos@680 | 18 bad -> bak_left [color=grey]; |
bos@680 | 19 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey]; |
bos@680 | 20 |
bos@680 | 21 bad -> bak_right [color=grey]; |
bos@680 | 22 right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey]; |
bos@680 | 23 |
bos@680 | 24 bak_left -> good; |
bos@680 | 25 bak_right -> good; |
bos@680 | 26 } |