Mercurial > lilug > scm

changeset 20:cf34475e583d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More distributed work flow
author Josef "Jeff" Sipek <jeffpc@optonline.net>
date Tue, 13 Sep 2005 11:42:24 -0400
parents cd8871811ba8
children b708b3b0c3c7
files Makefile distributed-afterpush.dot distributed-clone2.dot distributed-clone3.dot distributed-push.dot slideshow.tex
diffstat 6 files changed, 69 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Sep 13 11:14:19 2005 -0400
+++ b/Makefile	Tue Sep 13 11:42:24 2005 -0400
@@ -16,8 +16,12 @@
 	dot -Tps client-server-layout.dot -o client-server-layout.ps
 	dot -Tps distributed.dot -o distributed.ps
 	dot -Tps distributed-clone.dot -o distributed-clone.ps
+	dot -Tps distributed-clone2.dot -o distributed-clone2.ps
+	dot -Tps distributed-clone3.dot -o distributed-clone3.ps
 	dot -Tps distributed-modified.dot -o distributed-modified.ps
 	dot -Tps distributed-commit.dot -o distributed-commit.ps
+	dot -Tps distributed-push.dot -o distributed-push.ps
+	dot -Tps distributed-afterpush.dot -o distributed-afterpush.ps
 	dot -Tps distributed-layout.dot -o distributed-layout.ps
 
 clean:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distributed-afterpush.dot	Tue Sep 13 11:42:24 2005 -0400
@@ -0,0 +1,13 @@
+digraph G {
+	size ="3,3";
+	{ rank = same; RepoA [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository A"];
+	RepoB [shape=box,label="Repository B"]; }
+	{ rank = same; RepoC [shape=box,label="Repository C"];
+	RepoD [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository D"]; }
+	RepoA -> RepoB [arrowhead=none,style=dashed];
+	RepoA -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoD [arrowhead=none,style=dashed];
+	RepoC -> RepoD [arrowhead=none,style=dashed];
+	RepoD -> RepoA [arrowhead=none,style=dashed];
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distributed-clone2.dot	Tue Sep 13 11:42:24 2005 -0400
@@ -0,0 +1,13 @@
+digraph G {
+	size ="3,3";
+	{ rank = same; RepoA [shape=box,style=filled,color="0.3 1.0 0.7",label="Repository A"];
+	RepoB [shape=box,label="Repository B"]; }
+	{ rank = same; RepoC [shape=box,label="Repository C"];
+	RepoD [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository D"]; }
+	RepoA -> RepoB [style=dashed];
+	RepoA -> RepoC [arrowhead=none,style=dashed];
+	RepoC -> RepoB [arrowhead=none,style=dashed];
+	RepoD -> RepoB [style=dashed];
+	RepoC -> RepoD [arrowhead=none,style=dashed];
+	RepoA -> RepoD [arrowhead=none,style=dashed];
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distributed-clone3.dot	Tue Sep 13 11:42:24 2005 -0400
@@ -0,0 +1,13 @@
+digraph G {
+	size ="3,3";
+	{ rank = same; RepoA [shape=box,style=filled,color="0.3 1.0 0.7",label="Repository A"];
+	RepoB [shape=box,style=filled,color="0.3 1.0 0.7",label="Repository B"]; }
+	{ rank = same; RepoC [shape=box,label="Repository C"];
+	RepoD [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository D"]; }
+	RepoA -> RepoB [style=dashed];
+	RepoA -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoD [arrowhead=none,style=dashed];
+	RepoC -> RepoD [arrowhead=none,style=dashed];
+	RepoA -> RepoD [arrowhead=none,style=dashed];
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/distributed-push.dot	Tue Sep 13 11:42:24 2005 -0400
@@ -0,0 +1,13 @@
+digraph G {
+	size ="3,3";
+	{ rank = same; RepoA [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository A"];
+	RepoB [shape=box,label="Repository B"]; }
+	{ rank = same; RepoC [shape=box,label="Repository C"];
+	RepoD [shape=box,style=filled,color="1.0 0.7 0.7",label="Repository D"]; }
+	RepoA -> RepoB [arrowhead=none,style=dashed];
+	RepoA -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoC [arrowhead=none,style=dashed];
+	RepoB -> RepoD [arrowhead=none,style=dashed];
+	RepoC -> RepoD [arrowhead=none,style=dashed];
+	RepoD -> RepoA [style=dashed];
+}
--- a/slideshow.tex	Tue Sep 13 11:14:19 2005 -0400
+++ b/slideshow.tex	Tue Sep 13 11:42:24 2005 -0400
@@ -71,7 +71,7 @@
 	\end{center}
 \end{slide}}
 
-% DEMO: subversion checkout, modify, commit - oops! Access Denied
+% DEMO: subversion checkout, modify, commit - oops! Access Denied, display log (no change :-( )
 
 \overlays{3}{
 \begin{slide}{Issues}
@@ -106,17 +106,26 @@
 	\end{tabular}
 \end{slide}}
 
-\overlays{4}{
+\overlays{9}{
 \begin{slide}{Workflow Example}
 	\begin{center}
 		\vspace{1cm}
 		\onlySlide*{1}{\includegraphics{distributed.ps}} %  - server, client
-		\onlySlide*{2}{\includegraphics{distributed-clone.ps}} %  - client checks out a copy
+		\onlySlide*{2}{\includegraphics{distributed-clone.ps}} %  - client clones the repo
 		\onlySlide*{3}{\includegraphics{distributed-modified.ps}} %  - client modifies code
-		\onlySlide*{4}{\includegraphics{distributed-commit.ps}} %  - client commits changes to server
+		\onlySlide*{4}{\includegraphics{distributed-commit.ps}} %  - client commits changes
+% DEMO: mercurial clone, modify, commit - oooh it works!, show log (history!)
+% DEMO: go to parent repo and show history (no change!)
+		\onlySlide*{5}{\includegraphics{distributed-push.ps}} % client pushes to parent repo
+% DEMO: push the changes to the parent
+		\onlySlide*{6}{\includegraphics{distributed-afterpush.ps}} %  - so we have 2 independent repos
+		\onlySlide*{7}{\includegraphics{distributed-commit.ps}} %  - let's go back...
+		\onlySlide*{8}{\includegraphics{distributed-clone2.ps}} %  - we have a choice!
+		\onlySlide*{9}{\includegraphics{distributed-clone3.ps}} %  - say we don't like repo D
 	\end{center}
 \end{slide}}
 
+
 \overlays{2}{
 \begin{slide}{Distributed (eg. Mercurial)}
 	\begin{itemstep}