From 17e3ff518bc88f8a0b938ba9138bfe3c6288a585 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 16 Aug 2015 21:06:14 +0100 Subject: [PATCH] finished? --- Makefile | 2 +- moreinfo.fig | 2 ++ talk.txt | 35 ++++++++++++++++++++++++----------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 5057262..e57d02c 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ SLIDES+= nmu-linear SLIDES+= nmu-basic SLIDES+= nmu-compare SLIDES+= data-flow -SLIDES+= fmt-status SLIDES+= dflow-equal +SLIDES+= fmt-status SLIDES+= data-flow SLIDES+= dflow-equal SLIDES+= manpage diff --git a/moreinfo.fig b/moreinfo.fig index 602a90b..ae8a291 100644 --- a/moreinfo.fig +++ b/moreinfo.fig @@ -18,3 +18,5 @@ Single 4 0 0 50 -1 16 20 0.0000 4 315 690 900 1350 Joey\001 4 0 0 50 -1 16 20 0.0000 4 240 690 900 1890 DSA\001 4 0 0 50 -1 16 20 0.0000 4 300 1350 900 2340 ftpmaster\001 +4 0 0 50 -1 16 24 0.0000 4 315 2070 900 7020 Questions?\001 +4 0 0 50 -1 12 20 0.0000 4 255 6045 900 6030 ijackson@chiark.greenend.org.uk\001 diff --git a/talk.txt b/talk.txt index 2235033..7cddda2 100644 --- a/talk.txt +++ b/talk.txt @@ -5,7 +5,8 @@ Hi. I'm here to plug dgit, which is a system for treating the Debian archive like a git remote. -I'm going to talk for about 25 minutess and then I'll take questions. +I'm going to try to keep my talk fairly short to leave time for +questions. Please save your questions for the end. Firstly, a bit of framing. @@ -226,12 +227,18 @@ dgit push imposes only two requirements on your git trees, which stem directly from dgit's objectives. The most important requirement is that your git tree is identical to -the unpacked source package. +the unpacked source package. This is the whole point of dgit, because +it enables dgit to always present to the user a working tree which is +the same as they would get from apt-get source. + + +=== Status table slide For all native and source format 1.0 packages (which will include -people using raw git to manage their delta from upstream), this is -already the interchange format. These maintainers can start using -dgit right away for all their maintainer uploads. Please do! +people using raw git to manage their delta from upstream), a git tree +identical to the source package is already the interchange git branch +format. These maintainers can start using dgit right away for all +their maintainer uploads. Please do! The other requirement of dgit is simply that the dgit branches are fast-forwarding. So if your tools have made a rebasing branch, you @@ -240,8 +247,6 @@ I'm intending to provide some rather more cooked way to do this but I haven't decided the exact shape yet. -=== 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 package, and can be worked on without knowledge of the maintainer's @@ -316,7 +321,7 @@ should at some point consider providing centrally an archive-based package history. -==== dgit requirements slide +==== data flow slide with EQUAL and FF But the most obvious challenge for a maintainer with an existing git branch, but trying to use dgit, is dgit's insistence that the source @@ -339,9 +344,9 @@ resolved by rerunning autotools. And a second way dgit's rule can bite is .gitignore. Most existing packaging tools remove .gitignore from source packages by default. -But, dgit dgit requires that the source package and git tree are the -same, so if your git tree has .gitignore in it, your source package -should too. +But, dgit requires that the source package and git tree are the same, +so if your git tree has .gitignore in it, your source package should +too. ==== manpage slide @@ -350,6 +355,9 @@ for upload; in generally, all that those build operations do differently to the underlying tool, is pass some appropriate -I options, to exclude exactly and only the .git directory. +With `1.0' this is sufficient. With `3.0 (quilt)', there is more work +to be done in the tools, as I mentioned earlier. + ==== manpage clean slide @@ -374,6 +382,11 @@ I have a number of plans for the future, some of which I may even get around to: +I need to implement the automatic adjustment of git-buildpackage and +git-dpm's git trees into the dgit branch format, and perhaps provide +some additional helper tools. + + dgit can't currently upload to DELAYED queues, which makes it a bit awkward for a fire-and-forget NMU. One way to implement this would be to push to the suite branch but send the package upload to DELAYED. -- 2.30.2