hgbook

view it/figs/bad-merge-5.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 713f0f69029a 793e15b562ef
children
line source
1 digraph bad_merge_5 {
2 ancestor [label="1: progenitore",color="#bbbbbb",fontcolor="#bbbbbb"];
3 left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
4 right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
5 bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
6 new [label="5: nuova modifica",color=grey,fontcolor=grey];
7
8 bak_left [label="6: ritiro n°1 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
9 bak_right [label="7: ritiro n°2 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
10 good [label="8: unione\ndei ritiri",color=grey,fontcolor=grey,shape=box];
11 last [label="9: unione con la\nnuova modifica",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 }