Mercurial > hgbook

annotate en/figs/bad-merge-3.dot @ 820:3edacbff2b43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add more details on Subversion conversion.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 28 Apr 2009 22:49:50 -0700
parents 7226e5e750a6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
807
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 digraph bad_merge_3 {
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 bak_left [label="6: backout 1 of\nbad merge",color=grey,shape=box];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 bak_right [label="8: backout 2 of\nbad merge",shape=box];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 ancestor -> left [color="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 ancestor -> right [color="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 left -> bad [color="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14 right -> bad [color="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 bad -> new [color="#bbbbbb"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
17 bad -> bak_left [color=grey];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
18 left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
19
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
20 bad -> bak_right;
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
21 right -> bak_right [style=dotted,label="--parent=3"];
7226e5e750a6 Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
22 }