hgbook

annotate fr/figs/bad-merge-3.dot @ 1114:527b86d55d4a

find changesets by author, revision, files, or words in the commit message
inotify: update installation information

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 7226e5e750a6
children
rev   line source
bos@680 1 digraph bad_merge_3 {
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,shape=box];
bos@680 9 bak_right [label="8: backout 2 of\nbad merge",shape=box];
bos@680 10
bos@680 11 ancestor -> left [color="#bbbbbb"];
bos@680 12 ancestor -> right [color="#bbbbbb"];
bos@680 13 left -> bad [color="#bbbbbb"];
bos@680 14 right -> bad [color="#bbbbbb"];
bos@680 15 bad -> new [color="#bbbbbb"];
bos@680 16
bos@680 17 bad -> bak_left [color=grey];
bos@680 18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
bos@680 19
bos@680 20 bad -> bak_right;
bos@680 21 right -> bak_right [style=dotted,label="--parent=3"];
bos@680 22 }