hgbook

view fr/figs/bad-merge-4.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
line source
1 digraph bad_merge_4 {
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,fontcolor=grey,shape=box];
9 bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box];
10 good [label="8: merge\nof backouts",shape=box];
11
12 ancestor -> left [color="#bbbbbb"];
13 ancestor -> right [color="#bbbbbb"];
14 left -> bad [color="#bbbbbb"];
15 right -> bad [color="#bbbbbb"];
16 bad -> new [color="#bbbbbb"];
17
18 bad -> bak_left [color=grey];
19 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
20
21 bad -> bak_right [color=grey];
22 right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
23
24 bak_left -> good;
25 bak_right -> good;
26 }