Mercurial > hgbook

annotate ja/figs/bad-merge-2.dot @ 838:d1f676a6a4b3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update mq chapter. propagate ef53d025f410.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 03 Dec 2009 01:26:08 +0900
parents d819bc2414f4
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_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 }