Mercurial > hgbook
annotate en/figs/bad-merge-2.dot @ 807:7226e5e750a6
Clean up chapter 8, and add content
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 21 Apr 2009 23:49:27 -0700 |
parents | |
children |
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_2 { |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 ancestor [label="1: ancestor",color=grey,fontcolor=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 left [label="2: my change",color=grey,fontcolor=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 right [label="3: your change",color=grey,fontcolor=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
5 bad [label="4: bad merge",color=grey,fontcolor=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 new [label="5: new change",color=grey,fontcolor=grey]; |
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",shape=box]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 ancestor -> left [color=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 ancestor -> right [color=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 left -> bad [color=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 right -> bad [color=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 bad -> new [color=grey]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 bad -> bak_left; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
17 left -> bak_left [style=dotted,label="--parent=2"]; |
7226e5e750a6
Clean up chapter 8, and add content
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 } |