archive-vcs

diff --git a/Makefile b/Makefile
index 54348b18cd9659051788f0f3c7fcaaa3e79615e5..56eebd36873ea2901eb0808806149d48696cdfbb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-SLIDES=manpage libavg access-table
+SLIDES=archive-vcs manpage libavg access-table
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 

diff --git a/archive-vcs.fig b/archive-vcs.fig
index ca182f821f4d43344584831530145263bea900ed..3edb008e37e0ac67d85987d5fcb32eee37b3a3e9 100644 (file)
--- a/archive-vcs.fig
+++ b/archive-vcs.fig
@@ -7,24 +7,8 @@ A4
 Single
 -2
 1200 2
-6 3600 5625 4275 6075
-1 2 0 1 0 7 60 -1 -1 0.000 1 0.0000 3937 5850 337 225 3600 5850 4274 5850
-2 2 0 1 7 7 59 -1 20 0.000 0 0 -1 0 0 5
-        3600 5850 4275 5850 4275 6075 3600 6075 3600 5850
--6
-6 4275 5625 4950 6075
-1 2 0 1 0 7 60 -1 -1 0.000 1 0.0000 4613 5850 337 225 4950 5850 4276 5850
-2 2 0 1 7 7 59 -1 20 0.000 0 0 -1 0 0 5
-        4950 5850 4275 5850 4275 5625 4950 5625 4950 5850
--6
-1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 2362 1350 1012 450 1350 900 3375 1800
-1 2 0 1 0 7 70 -1 -1 0.000 1 0.0000 2362 3600 1012 450 1350 3600 3374 3600
-2 2 0 1 7 7 60 -1 20 0.000 0 0 -1 0 0 5
-        1350 1350 3375 1350 3375 3600 1350 3600 1350 1350
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-        1350 1350 1350 3600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-        3375 1350 3375 3600
+1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 3712 1350 1012 450 2700 900 4725 1800
+1 2 0 1 0 7 70 -1 -1 0.000 1 0.0000 3712 3600 1012 450 2700 3600 4724 3600
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 7 0 0 2
         8550 1125 9000 1125
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 7 0 0 2
@@ -49,33 +33,45 @@ Single
         9450 1125 9900 1125
 2 1 0 2 0 7 50 -1 -1 0.000 0 0 7 0 0 3
         9450 675 9675 675 9900 675
+2 2 0 1 7 7 60 -1 20 0.000 0 0 -1 0 0 5
+        2700 1350 4725 1350 4725 3600 2700 3600 2700 1350
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        2700 1350 2700 3600
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        4725 1350 4725 3600
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
+       0 0 1.00 120.00 240.00
+        5175 1575 8325 1575
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
        0 0 1.00 120.00 240.00
-        3825 1575 7875 1575
+        8325 3600 5175 3600
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        7200 5850 7200 7650
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+        5625 5850 5625 7650
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2
        0 0 1.00 120.00 240.00
-        7875 3600 3825 3600
-3 2 0 1 0 7 50 -1 -1 0.000 0 0 0 5
-        5850 5850 6075 5625 6300 5850 6525 6075 6750 5850
-        0.000 -1.000 -1.000 -1.000 0.000
+        3600 4500 5175 6075
 3 2 0 1 0 7 50 -1 -1 0.000 0 0 0 4
-        7200 5850 7425 5625 7875 6075 8100 5850
+        5625 7650 6075 7425 6750 7875 7200 7650
         0.000 -1.000 -1.000 0.000
 3 2 0 1 0 7 50 -1 -1 0.000 0 0 0 4
-        8550 5850 9000 5625 9450 6075 9900 5850
+        5625 5850 6075 5625 6750 6075 7200 5850
         0.000 -1.000 -1.000 0.000
-3 2 0 1 0 7 50 -1 -1 0.000 0 0 0 7
-        10350 5850 10575 5625 10800 5625 11025 5850 11250 6075 11475 6075
-        11700 5850
-        0.000 -1.000 -1.000 -1.000 -1.000 -1.000 0.000
-3 2 0 1 0 7 50 -1 -1 0.000 0 0 0 6
-        2250 7425 2475 7200 2700 7200 3150 7650 3375 7650 3600 7425
-        0.000 -1.000 -1.000 -1.000 -1.000 0.000
-4 0 0 50 -1 16 24 0.0000 4 375 975 1575 2475 Repo\001
-4 0 0 50 -1 1 24 0.0000 4 285 1290 1575 2925 Archive\001
 4 0 0 50 -1 0 24 0.0000 4 360 1485 10125 1575 Working\001
 4 0 0 50 -1 0 24 0.0000 4 240 615 10125 2040 tree\001
-4 0 0 50 -1 1 16 0.0000 4 255 2205 4275 2025 dget / apt-get source\001
-4 0 0 50 -1 1 16 0.0000 4 255 1620 4275 4050 dupload / dput\001
-4 0 0 50 -1 16 16 0.0000 4 270 1710 4275 3375 commit / push\001
-4 0 0 50 -1 16 16 0.0000 4 210 2040 4275 1350 clone / checkout\001
+4 0 0 50 -1 16 16 0.0000 4 210 1350 900 2025 vcs branch\001
+4 0 0 50 -1 16 24 0.0000 4 375 975 2925 2475 Repo\001
+4 0 0 50 -1 1 24 0.0000 4 285 1290 2925 2925 Archive\001
+4 0 0 50 -1 1 16 0.0000 4 255 1620 5625 4050 dupload / dput\001
+4 0 0 50 -1 16 16 0.0000 4 270 1710 5625 3375 commit / push\001
+4 0 0 50 -1 16 16 0.0000 4 210 2040 5625 1350 clone / checkout\001
+4 0 0 50 -1 16 16 0.0000 4 270 900 4275 4725 vcs log\001
+4 0 0 50 -1 1 16 0.0000 4 255 1995 4500 5175 debian/changelog\001
+4 0 0 50 -1 16 16 0.0000 4 210 1230 2475 5175 vcs blame\001
+4 0 0 50 -1 1 16 0.0000 4 195 555 1575 2475 d???\001
+4 0 0 50 -1 1 16 0.0000 4 195 555 3150 5625 d???\001
+4 0 0 50 -1 16 24 0.0000 4 300 2670 9000 6300 version control\001
+4 0 0 50 -1 1 24 0.0000 4 285 2580 9000 7200 Debian archive\001
+4 0 0 50 -1 0 24 0.0000 4 180 375 9675 6750 vs\001
+4 0 0 50 -1 1 16 0.0000 4 210 1545 5625 2025 apt-get source\001

diff --git a/talk.txt b/talk.txt
index 106e7160a6936c3322dc884e020d0143bbe7d2cb..4140e3ec1918b08e030089f9e90d9893e46d70f2 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -5,17 +5,14 @@
 
 The Debian archive is (amongst other things) a version control system.
 
-  Clone (checkout) <=> apt-get source
-  Commit+push <=> upload
+Clone (checkout) <=> apt-get source
+Commit+push <=> upload
 
-But:
+But the archive has no really sensible branching.  It history browsing
+is appalling.  And it has pretty bad interaction with other VCSs.  In
+particular we want to be using git.
 
-  No sensible branching
-  history browsing is appalling 
-  Terrible interaction with other VCSs
-  In particular we want to be using git
-
-Solution
+So what to do ?
 
 Well, we might replace it.  But the archive is various other things
 besides an appallingly bad VCS.  And a lot of our co-developers are