update

diff --git a/.gitignore b/.gitignore
index d3ae92a7061245276635208f86dbb015737674fa..6477501f32070dd4d7cd232150b9975d63739d93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ manpage.ps
 manpage.ps.?
 manpage-clean.ps
 manpage-clean.ps.?
+moreinfo.ps
+fmt-status.ps

diff --git a/Makefile b/Makefile
index d95cbd07ed4ead663ae7ebcf93aba7f1e4390a69..505726237549af7b47b43fdc5cf8e6a0a735e979 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,14 @@ SLIDES+= nmu-linear
 SLIDES+= nmu-basic
 SLIDES+= nmu-compare
 SLIDES+= data-flow
+SLIDES+= fmt-status
 SLIDES+= dflow-equal
 SLIDES+= data-flow
 SLIDES+= dflow-equal
 SLIDES+= manpage
 SLIDES+= manpage-clean
 SLIDES+= future
+SLIDES+= moreinfo
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))
 

diff --git a/fmt-status.fig b/fmt-status.fig
new file mode 100644 (file)
index 0000000..a6a95f2
--- /dev/null
+++ b/fmt-status.fig
@@ -0,0 +1,53 @@
+#FIG 3.2  Produced by xfig version 3.2.5b
+Landscape
+Center
+Metric
+A4      
+100.00
+Single
+-2
+1200 2
+0 32 #ffddaa
+6 720 4860 1530 5670
+4 0 0 50 -1 16 20 0.0000 4 225 450 720 5130 3.0\001
+4 0 0 50 -1 16 20 0.0000 4 315 810 720 5520 (quilt)\001
+-6
+6 720 6570 1530 7380
+4 0 0 50 -1 16 20 0.0000 4 225 450 720 6840 3.0\001
+4 0 0 50 -1 16 20 0.0000 4 315 810 720 7230 (quilt)\001
+-6
+2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        450 1530 11970 1530
+2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        450 4590 11970 4590
+2 1 0 2 0 7 50 -1 -1 4.500 0 0 -1 0 0 2
+        5940 720 5940 7650
+4 0 0 50 -1 16 20 0.0000 4 240 1410 720 2070 1.0 native\001
+4 0 0 50 -1 16 20 0.0000 4 240 975 720 2700 1.0 diff\001
+4 0 0 50 -1 16 20 0.0000 4 300 705 6300 1350 push\001
+4 0 0 50 -1 16 20 0.0000 4 240 975 720 3330 1.0 diff\001
+4 0 0 50 -1 14 20 0.0000 4 270 585 2700 2070 git\001
+4 0 0 50 -1 14 20 0.0000 4 270 1755 2700 2700 git-merge\001
+4 0 0 50 -1 14 20 0.0000 4 270 1950 2700 3330 git-rebase\001
+4 0 0 50 -1 14 20 0.0000 4 270 1755 8100 2070 dgit pull\001
+4 0 0 50 -1 14 20 0.0000 4 270 1755 8100 2700 dgit pull\001
+4 0 12 50 -1 16 20 0.0000 4 240 525 6300 2070 Go!\001
+4 0 12 50 -1 16 20 0.0000 4 240 525 6300 2700 Go!\001
+4 0 12 50 -1 16 20 0.0000 4 240 525 6300 3330 Go!\001
+4 0 0 50 -1 16 20 0.0000 4 315 1980 8100 1350 integrate nmu\001
+4 0 0 50 -1 16 20 0.0000 4 315 1710 2700 1350 git workflow\001
+4 0 0 50 -1 16 20 0.0000 4 240 915 630 1350 format\001
+4 0 0 50 -1 16 20 0.0000 4 180 975 630 990 source\001
+4 0 0 50 -1 16 24 0.0000 4 390 10275 630 270 dgit compatibility status for various maintainer workflows\001
+4 0 0 50 -1 16 20 0.0000 4 315 2550 8370 4140 (will be improved)\001
+4 0 0 50 -1 14 20 0.0000 4 270 3315 8100 3690 git-merge -s ours\001
+4 0 0 50 -1 14 20 0.0000 4 270 2145 8100 3330 dgit fetch;\001
+4 0 4 50 -1 16 20 0.0000 4 300 2490 6300 5220 Watch this space\001
+4 0 4 50 -1 16 18 0.0000 4 270 2175 6300 7110 Watch this space\001
+4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 5760 problems:\001
+4 0 4 50 -1 16 18 0.0000 4 270 3750 7740 5760 patches applied vs. unapplied\001
+4 0 4 50 -1 14 18 0.0000 4 240 1650 7650 6210 .gitignore\001
+4 0 4 50 -1 14 18 0.0000 4 240 1650 7560 7650 .gitignore\001
+4 0 4 50 -1 16 18 0.0000 4 270 1245 6300 7650 problems:\001
+4 0 0 50 -1 14 20 0.0000 4 270 3120 2700 5220 git-buildpackage\001
+4 0 0 50 -1 14 20 0.0000 4 270 1365 2700 7110 git-dpm\001

diff --git a/talk.txt b/talk.txt
index c9e820cc21cae79b553e133f59bf7077f6d794d5..223503358ed6ec8c8340e361748538f1140e2846 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -91,6 +91,12 @@ for you.  If you /are/ doing a new upstream version, then presumably
 you have obtained the origs as part of preparing your package, or you
 can build them easily.
 
+I should mention that currently only dgit push updates the history on
+the dgit git server.  So until a package is pushed with dgit push for
+the first time, doesn't exist on that server; and even after then,
+non-dgit uploads are not recorded, so the history can be out of date.
+I'm hoping to improve this in the future.
+
 
 ==== NMU linear history slide
 
@@ -234,7 +240,7 @@ I'm intending to provide some rather more cooked way to do this but I
 haven't decided the exact shape yet.
 
 
-==== 3.0 quilt applied slide
+=== Status table slide
 
 For `3.0 (quilt)' packages, things are more complicated.  The purpose
 of dgit is to provide a git view which is identical to the source
@@ -258,7 +264,6 @@ synthesising an extra git commit, to apply the patches, and then
 pushing that to the dgit git server.  (The extra git commit wouldn't
 appear on your own branch; if it did, it would cause trouble.)
 
-=== xxxx status table
 
 There is another problem which affects both git-buildpackage and
 git-dpm: namely, .gitignore files.  Neither git-buildpackage nor
@@ -278,23 +283,6 @@ patches-unapplied branch to a directly-editable patches-applied one.
 
 
 
-xxx empty directories
-
-
-  I'm told that gbp pq can be used to generate a
-patches-applied branch, and that some users prefer to use that as the
-interchange git branch, but I know this is far from universal.  I'm
-talking to the git-buildpackage maintainers about gbp integration, so
-watch this space.
-
-
-, and for users of git-dpm and
-
-(more or less) 
-  xxx
-
-
-
 ==== data flow slide
 
 There are a few other things I ought to cover, since they often come
@@ -311,13 +299,11 @@ right now, have a record of DMs' ssh keys.
 
 The second thing that's less than ideal is that the dgit git history
 does not generally include the package upload history.
-git-import-dscs can produce a git branch representing the upload
-
-xxx patches-applied
-
-history, but dgit doesn't run that itself.  It would be difficult for
-dgit to do so because deciding which set of versions to include is
-nontrivial and of course it would involve an awful lot of downloading.
+git-import-dscs can produce a git branch more or less representing the
+upload history, but dgit doesn't run that itself.  It would be
+difficult for dgit to do so because deciding which set of versions to
+include is nontrivial and of course it would involve an awful lot of
+downloading.
 
 One could push such a branch to the archive with dgit push.  But, it
 seems to me that the git history structure ought to up to the