annotate en/figs/bad-merge-2.dot @ 1030:2ac31ea48a3d
merge with trunk
| author |
Romain PELISSE <belaran@gmail.com> |
| date |
Thu Apr 22 12:39:32 2010 +0200 (2010-04-22) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@680
|
1 digraph bad_merge_2 {
|
|
bos@680
|
2 ancestor [label="1: ancestor",color=grey,fontcolor=grey];
|
|
bos@680
|
3 left [label="2: my change",color=grey,fontcolor=grey];
|
|
bos@680
|
4 right [label="3: your change",color=grey,fontcolor=grey];
|
|
bos@680
|
5 bad [label="4: bad merge",color=grey,fontcolor=grey];
|
|
bos@680
|
6 new [label="5: new change",color=grey,fontcolor=grey];
|
|
bos@680
|
7
|
|
bos@680
|
8 bak_left [label="6: backout 1 of\nbad merge",shape=box];
|
|
bos@680
|
9
|
|
bos@680
|
10 ancestor -> left [color=grey];
|
|
bos@680
|
11 ancestor -> right [color=grey];
|
|
bos@680
|
12 left -> bad [color=grey];
|
|
bos@680
|
13 right -> bad [color=grey];
|
|
bos@680
|
14 bad -> new [color=grey];
|
|
bos@680
|
15
|
|
bos@680
|
16 bad -> bak_left;
|
|
bos@680
|
17 left -> bak_left [style=dotted,label="--parent=2"];
|
|
bos@680
|
18 }
|
