hgbook
view en/figs/bad-merge-2.dot @ 917:93154fbaae9b
Merge with http://bitbucket.org/dukebody/hgbook-alqua/
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Oct 27 21:31:06 2009 -0700 (2009-10-27) |
| parents | |
| children |
line source
1 digraph bad_merge_2 {
2 ancestor [label="1: ancestor",color=grey,fontcolor=grey];
3 left [label="2: my change",color=grey,fontcolor=grey];
4 right [label="3: your change",color=grey,fontcolor=grey];
5 bad [label="4: bad merge",color=grey,fontcolor=grey];
6 new [label="5: new change",color=grey,fontcolor=grey];
8 bak_left [label="6: backout 1 of\nbad merge",shape=box];
10 ancestor -> left [color=grey];
11 ancestor -> right [color=grey];
12 left -> bad [color=grey];
13 right -> bad [color=grey];
14 bad -> new [color=grey];
16 bad -> bak_left;
17 left -> bak_left [style=dotted,label="--parent=2"];
18 }