Mercurial > hgbook

changeset 836:d819bc2414f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add figs/bad-merge-*.dot. a part of 7226e5e750a6.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 23 Jul 2009 18:10:58 +0900
parents 8a3041e6f3cb
children b775f963b18c
files ja/figs/bad-merge-1.dot ja/figs/bad-merge-2.dot ja/figs/bad-merge-3.dot ja/figs/bad-merge-4.dot ja/figs/bad-merge-5.dot
diffstat 5 files changed, 109 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-1.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,13 @@
+digraph bad_merge_1 {
+	ancestor [label="1: ancestor"];
+	left [label="2: my change"];
+	right [label="3: your change"];
+	bad [label="4: bad merge"];
+	new [label="5: new change"];
+
+	ancestor -> left;
+	ancestor -> right;
+	left -> bad;
+	right -> bad;
+	bad -> new;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-2.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,18 @@
+digraph bad_merge_2 {
+	ancestor [label="1: ancestor",color=grey,fontcolor=grey];
+	left [label="2: my change",color=grey,fontcolor=grey];
+	right [label="3: your change",color=grey,fontcolor=grey];
+	bad [label="4: bad merge",color=grey,fontcolor=grey];
+	new [label="5: new change",color=grey,fontcolor=grey];
+
+	bak_left [label="6: backout 1 of\nbad merge",shape=box];
+
+	ancestor -> left [color=grey];
+	ancestor -> right [color=grey];
+	left -> bad [color=grey];
+	right -> bad [color=grey];
+	bad -> new [color=grey];
+
+	bad -> bak_left;
+	left -> bak_left [style=dotted,label="--parent=2"];
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-3.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,22 @@
+digraph bad_merge_3 {
+	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left [label="6: backout 1 of\nbad merge",color=grey,shape=box];
+	bak_right [label="8: backout 2 of\nbad merge",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color=grey];
+	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+
+	bad -> bak_right;
+	right -> bak_right [style=dotted,label="--parent=3"];
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-4.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,26 @@
+digraph bad_merge_4 {
+	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: new change",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left [label="6: backout 1 of\nbad merge",color=grey,fontcolor=grey,shape=box];
+	bak_right [label="7: backout 2 of\nbad merge",color=grey,fontcolor=grey,shape=box];
+	good [label="8: merge\nof backouts",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color=grey];
+	left -> bak_left [style=dotted,label="--parent=2",color=grey,fontcolor=grey];
+
+	bad -> bak_right [color=grey];
+	right -> bak_right [style=dotted,label="--parent=3",color=grey,fontcolor=grey];
+
+	bak_left -> good;
+	bak_right -> good;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/figs/bad-merge-5.dot	Thu Jul 23 18:10:58 2009 +0900
@@ -0,0 +1,30 @@
+digraph bad_merge_5 {
+	ancestor [label="1: ancestor",color="#bbbbbb",fontcolor="#bbbbbb"];
+	left [label="2: my change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	right [label="3: your change",color="#bbbbbb",fontcolor="#bbbbbb"];
+	bad [label="4: bad merge",color="#bbbbbb",fontcolor="#bbbbbb"];
+	new [label="5: new change",color=grey,fontcolor=grey];
+
+	bak_left [label="6: backout 1 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	bak_right [label="7: backout 2 of\nbad merge",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+	good [label="8: merge\nof backouts",color=grey,fontcolor=grey,shape=box];
+	last [label="9: merge with\nnew change",shape=box];
+
+	ancestor -> left [color="#bbbbbb"];
+	ancestor -> right [color="#bbbbbb"];
+	left -> bad [color="#bbbbbb"];
+	right -> bad [color="#bbbbbb"];
+	bad -> new [color="#bbbbbb"];
+
+	bad -> bak_left [color="#bbbbbb"];
+	left -> bak_left [style=dotted,label="--parent=2",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bad -> bak_right [color="#bbbbbb"];
+	right -> bak_right [style=dotted,label="--parent=3",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+	bak_left -> good [color=grey];
+	bak_right -> good [color=grey];
+
+	good -> last;
+	new -> last;
+}