# HG changeset patch
# User Giulio@puck
# Date 1250608770 -7200
# Node ID ea5ae4dd787b201d685068172f7b742d3b2b6371
# Parent 124179faec5f9722227de55c8fd5c2a080316c56
Add images.
diff -r 124179faec5f -r ea5ae4dd787b it/Makefile
--- a/it/Makefile Mon Aug 17 01:53:50 2009 +0200
+++ b/it/Makefile Tue Aug 18 17:19:30 2009 +0200
@@ -58,3 +58,35 @@
clean:
rm -f $(web-local)/index-read.html.in
rm -rf $(obj-web)
+
+image-folder := figs
+# graphs, figures, screenshots
+image-files := $(wildcard $(image-folder)/*.dot $(image-folder)/*.svg $(image-folder)/*.png)
+# graphs
+image-dot := $(filter %.dot, $(image-files))
+# figures
+image-svg := $(filter %.svg, $(image-files))
+# screenshots
+image-png := $(filter %.png, $(image-files))
+
+figs-folder := examples/figs
+figs-web := \
+ $(image-dot:$(image-folder)/%.dot=$(figs-folder)/%.png) \
+ $(image-svg:$(image-folder)/%.svg=$(figs-folder)/%.png) \
+ $(image-png:$(image-folder)/%.png=$(figs-folder)/%.png)
+
+figs: $(figs-web)
+
+#$(figs-folder)/%.png: $(image-folder)/%.png $(image-folder)/%.svg
+$(figs-folder)/%.png: $(image-folder)/%.svg
+ inkscape -D -d 120 -e $@ $<
+
+$(figs-folder)/%.png: $(figs-folder)/%.svg
+ inkscape -D -d 120 -e $@ $<
+ rm $<
+
+$(figs-folder)/%.png: $(image-folder)/%.png
+ cp $< $@
+
+$(figs-folder)/%.svg: $(image-folder)/%.dot
+ dot -Tsvg -o $@ $<
diff -r 124179faec5f -r ea5ae4dd787b it/figs/bad-merge-1.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/bad-merge-1.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,13 @@
+digraph bad_merge_1 {
+ ancestor [label="1: antenato"];
+ left [label="2: mia modifica"];
+ right [label="3: vostra modifica"];
+ bad [label="4: unione sbagliata"];
+ new [label="5: nuova modifica"];
+
+ ancestor -> left;
+ ancestor -> right;
+ left -> bad;
+ right -> bad;
+ bad -> new;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/bad-merge-2.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/bad-merge-2.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,18 @@
+digraph bad_merge_2 {
+ ancestor [label="1: antenato",color=grey,fontcolor=grey];
+ left [label="2: mia modifica",color=grey,fontcolor=grey];
+ right [label="3: vostra modifica",color=grey,fontcolor=grey];
+ bad [label="4: unione sbagliata",color=grey,fontcolor=grey];
+ new [label="5: nuova modifica",color=grey,fontcolor=grey];
+
+ bak_left [label="6: ritiro n°1 della\nunione sbagliata",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"];
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/bad-merge-3.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/bad-merge-3.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,22 @@
+digraph bad_merge_3 {
+ ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+ left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+ new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+ bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,shape=box];
+ bak_right [label="8: ritiro n°2 della\nunione sbagliata",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"];
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/bad-merge-4.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/bad-merge-4.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,26 @@
+digraph bad_merge_4 {
+ ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+ left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+ new [label="5: nuova modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+
+ bak_left [label="6: ritiro n°1 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
+ bak_right [label="7: ritiro n°2 della\nunione sbagliata",color=grey,fontcolor=grey,shape=box];
+ good [label="8: unione\ndei ritiri",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;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/bad-merge-5.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/bad-merge-5.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,30 @@
+digraph bad_merge_5 {
+ ancestor [label="1: antenato",color="#bbbbbb",fontcolor="#bbbbbb"];
+ left [label="2: mia modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ right [label="3: vostra modifica",color="#bbbbbb",fontcolor="#bbbbbb"];
+ bad [label="4: unione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb"];
+ new [label="5: nuova modifica",color=grey,fontcolor=grey];
+
+ bak_left [label="6: ritiro n°1 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+ bak_right [label="7: ritiro n°2 della\nunione sbagliata",color="#bbbbbb",fontcolor="#bbbbbb",shape=box];
+ good [label="8: unione\ndei ritiri",color=grey,fontcolor=grey,shape=box];
+ last [label="9: unione con la\nnuova modifica",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;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/feature-branches.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/feature-branches.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,8 @@
+digraph feature_branches {
+ principale -> cripto;
+ principale -> filesystem;
+ principale -> ipc;
+ principale -> memoria;
+ principale -> rete;
+ principale -> sicurezza;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/filelog.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/filelog.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,381 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/metadata.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/metadata.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,328 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/mq-stack.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/mq-stack.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,270 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/revlog.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/revlog.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,1155 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/snapshot.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/snapshot.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,202 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/tour-history.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/tour-history.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,289 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/tour-merge-conflict.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/tour-merge-conflict.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,210 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/tour-merge-merge.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/tour-merge-merge.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,380 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/tour-merge-pull.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/tour-merge-pull.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,288 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/tour-merge-sep-repos.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/tour-merge-sep-repos.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,466 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/undo-manual-merge.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/undo-manual-merge.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,8 @@
+digraph undo_manual {
+ "prima modifica" -> "seconda modifica";
+ "seconda modifica" -> "terza modifica";
+ backout [label="ritira la\nseconda modifica", shape=box];
+ "seconda modifica" -> backout;
+ "terza modifica" -> "unione\nmanuale";
+ backout -> "unione\nmanuale";
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/undo-manual.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/undo-manual.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,6 @@
+digraph undo_manual {
+ "prima modifica" -> "seconda modifica";
+ "seconda modifica" -> "terza modifica";
+ backout [label="ritira la\nseconda modifica", shape=box];
+ "seconda modifica" -> backout;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/undo-non-tip.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/undo-non-tip.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,9 @@
+digraph undo_non_tip {
+ "prima modifica" -> "seconda modifica";
+ "seconda modifica" -> "terza modifica";
+ backout [label="ritira la\nseconda modifica", shape=box];
+ "seconda modifica" -> backout;
+ merge [label="unione\nautomatica", shape=box];
+ "terza modifica" -> merge;
+ backout -> merge;
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/undo-simple.dot
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/undo-simple.dot Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,4 @@
+digraph undo_simple {
+ "prima modifica" -> "seconda modifica";
+ "seconda modifica" -> "ritira la\nseconda modifica";
+}
diff -r 124179faec5f -r ea5ae4dd787b it/figs/wdir-after-commit.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/wdir-after-commit.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,394 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/wdir-branch.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/wdir-branch.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,418 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/wdir-merge.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/wdir-merge.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,425 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/wdir-pre-branch.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/wdir-pre-branch.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,364 @@
+
+
+
diff -r 124179faec5f -r ea5ae4dd787b it/figs/wdir.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/it/figs/wdir.svg Tue Aug 18 17:19:30 2009 +0200
@@ -0,0 +1,348 @@
+
+
+