Mercurial > lilug > scm

changeset 6:80fbd1691bf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added 4 .dot files, handnout.tex, and few other misc files
author Josef "Jeff" Sipek <jeffpc@optonline.net>
date Sat, 10 Sep 2005 23:24:20 -0400
parents e605b0542929
children 17dd5f46c740
files Makefile client-server-checkout.dot client-server-commit.dot client-server-modified.dot client-server.dot handout.tex ideas pres-notes.tex slideshow.tex
diffstat 9 files changed, 110 insertions(+), 39 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Sep 10 23:23:06 2005 -0400
+++ b/Makefile	Sat Sep 10 23:24:20 2005 -0400
@@ -1,2 +1,13 @@
-all:
+all: diagrams slideshow handout
+
+slideshow:
 	latex slideshow.tex && dvipdf slideshow.dvi
+
+handout:
+	latex handout.tex && dvipdf handout.dvi
+
+diagrams:
+	dot -Tps client-server.dot -o client-server.ps
+	dot -Tps client-server-checkout.dot -o client-server-checkout.ps
+	dot -Tps client-server-modified.dot -o client-server-modified.ps
+	dot -Tps client-server-commit.dot -o client-server-commit.ps
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client-server-checkout.dot	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,10 @@
+digraph G {
+	size ="4,4";
+	Repository [shape=box,style=filled,color="0.3 1.0 0.7"];
+	ClientA [shape=box,label="Client A",style=filled,color="0.3 1.0 0.7"];
+	ClientB [shape=box,label="Client B"];
+	ClientC [shape=box,label="Client C"];
+	Repository -> ClientA;
+	Repository -> ClientB;
+	Repository -> ClientC;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client-server-commit.dot	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,10 @@
+digraph G {
+	size ="4,4";
+	Repository [shape=box,style=filled,color="0.3 1.0 1.0"];
+	ClientA [shape=box,label="Client A",style=filled,color="0.3 1.0 1.0"];
+	ClientB [shape=box,label="Client B"];
+	ClientC [shape=box,label="Client C"];
+	Repository -> ClientA;
+	Repository -> ClientB;
+	Repository -> ClientC;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client-server-modified.dot	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,10 @@
+digraph G {
+	size ="4,4";
+	Repository [shape=box,style=filled,color="0.3 1.0 0.7"];
+	ClientA [shape=box,label="Client A",style=filled,color="0.3 1.0 1.0"];
+	ClientB [shape=box,label="Client B"];
+	ClientC [shape=box,label="Client C"];
+	Repository -> ClientA;
+	Repository -> ClientB;
+	Repository -> ClientC;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client-server.dot	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,10 @@
+digraph G {
+	size ="4,4";
+	Repository [shape=box,style=filled,color="0.3 1.0 0.7"];
+	ClientA [shape=box,label="Client A"];
+	ClientB [shape=box,label="Client B"];
+	ClientC [shape=box,label="Client C"];
+	Repository -> ClientA;
+	Repository -> ClientB;
+	Repository -> ClientC;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/handout.tex	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,26 @@
+% two sided printing
+\documentclass[letterpaper,12pt]{article}
+
+\begin{document}
+
+\begin{tabular}{|c|c|c|}
+	\hline
+	What			& Subversion		& Mercurial \\
+	\hline \hline
+	Create repository	& svnadmin create \emph{/path/to/repo}	& hg init \emph{/path/to/repo} \\
+	Clone repository	& \emph{does not apply}	& hg clone \emph{existing} \emph{/path/to/clone/to} \\
+	Commit changes		& svn commit		& hg commit \\
+	Push changes		& \emph{does not apply} & hg push \emph{remote repo} \\
+	Pull changes		& \emph{does not apply} & hg pull \emph{remote repo} \\
+	Getting updates		& svn update		& hg pull \&\& hg update \\
+	Tagging			& FIXME:???		& hg tag \emph{tag name} \\
+	View diff		& svn diff		& hg diff \\
+	View Status		& svn status		& hg status \\
+	Adding dirs and files	& svn add \emph{file name}	& hg add \emph{file name} \\
+	Removingirs and files	& svn rm \emph{file name}	& rm \emph{file name} \&\& hg rm \emph{file name} \\
+	Viewing history		& svn log		& hg log \\
+	\hline
+	
+\end{tabular}
+
+\end{document}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ideas	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,4 @@
+* stress the ideas of:
+	* disconnected operation
+	* having all the history right then and there == less network bandwidth required
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pres-notes.tex	Sat Sep 10 23:24:20 2005 -0400
@@ -0,0 +1,7 @@
+% two sided printing
+\documentclass[letterpaper,12pt]{article}
+
+\begin{document}
+
+
+\end{document}
--- a/slideshow.tex	Sat Sep 10 23:23:06 2005 -0400
+++ b/slideshow.tex	Sat Sep 10 23:24:20 2005 -0400
@@ -16,56 +16,39 @@
 % What is it?
 \overlays{1}{
 \begin{slide}{What's SCM/VCS?}
-	% like CVS, SVN, HG
-\end{slide}}
-
-% What is it good for?
-\overlays{1}{
-\begin{slide}{What is it good for?}
+	\begin{itemize}
+		\item Source Code Management
+		\item Version Control Systems
+	\end{itemize}
 \end{slide}}
 
 % What can it do?
-\overlays{1}{
+\overlays{3}{
 \begin{slide}{What can it do?}
-\end{slide}}
-
-% There are different models
-\overlays{2}{
-\begin{slide}{More than one way to skin a cat}
 	\begin{itemstep}
-		\item Centalized
-		\item Distributed
+		\item Keep revision history
+		\item Revert to any revision
+		\item Track down who changed particular line of code
 	\end{itemstep}
 \end{slide}}
 
-\overlays{3}{
-\begin{slide}{Centralized}
-	\begin{itemstep}	
-		\item CVS and Subversion
-		\item Central server
-		\item Clients checking code in/out
-	\end{itemstep}
+\overlays{4}{
+\begin{slide}{Client-Server (eg. Subversion)}
+	\begin{center}
+		% FIXME: animation of what happens
+		\onlySlide*{1}{\includegraphics{client-server.ps}} %  - server, client
+		\onlySlide*{2}{\includegraphics{client-server-checkout.ps}} %  - client checks out a copy
+		\onlySlide*{3}{\includegraphics{client-server-modified.ps}} %  - client modifies code
+		\onlySlide*{4}{\includegraphics{client-server-commit.ps}} %  - client commits changes to server
+	\end{center}
 \end{slide}}
 
-\overlays{1}{
-\begin{slide}{Centralized (cont'd.)}
-	% FIXME: animation of what happens
-	%  - server, client
-	%  - client checks out a copy
-	%  - client modifies code
-	%  - client commits changes to server
-\end{slide}}
-
-\overlays{1}{
-\begin{slide}{Centralized - Issues}
-	\begin{itemstep}
-		\item Non-committers are second-class citizens
-		% FIXME: more issues
-	\end{itemstep}
-\end{slide}}
+% issues:
+%	non-commiters are second class citizens
+%	promotes the use of patches - bad! why have SCM when you use patches?!
 
 \overlays{2}{
-\begin{slide}{Distributed}
+\begin{slide}{Distributed (eg. Mercurial)}
 	\begin{itemstep}
 		\item Bazaar-NG, Cogito/git, Darcs, GNU Arch, Mercurial, Monotone and SVK
 		\item No central server