1 From: Ian Jackson <ijackson@chiark.greenend.org.uk>
2 To: debian-devel@lists.debian.org
3 Subject: Survey: git packaging practices / repository format
4 Date: Tue, 28 May 2019 16:51:10 +0100
6 While trying to write the dgit FAQ, and some of the relevant docs, it
7 has become even more painfully obvious that we lack a good handle on
8 what all the different ways are that people use git to do their Debian
9 packaging, and what people call these formats/workflows, and what
12 Can you please look through the table below and see if I have covered
16 - have I missed a git repository and history layout
17 - have I missed a primary tool that should be mentioned
18 - are any of the details wrong for workflows that you use ?
20 Main packaging Delta from upstream Tools for manipulating
21 git branch represented as delta from upstream,
22 contains building .dsc, etc.
24 Unmodified debian/patches gbp, gbp pq
25 upstream files, (only) quilt / dquilt
26 plus debian/* Manual patch editing
29 Modified Direct changes git merge
30 upstream files, to upstream files (.dsc: 1.0-with-diff or
31 plus debian/*. single-debian-patch)
32 Maybe d/patches, depending.
33 History has direct merges from upstream.
35 Modified Direct changes to git-debrebase
36 upstream files, upstream files.
39 History is special git-debrebase rebasing topic branch format.
41 Modified Direct changes to git-dpm
42 upstream files, upstream files
46 History is special git-dpm rebasing topic branch format.
48 Only debian/*, d/patches, only; gbp ?
49 with d/patches Baseline upstream: quilt/dquilt ?
53 Only debian/*, d/patches, only; gbp ?
54 with d/patches Baseline upstream: quilt/dquilt ?
58 Template debian/*. Patches in package- language-specific
59 One branch for specific subdirectory; monorepo tooling,
60 many packages. found in same branch
61 Tooling to make Baseline upstream is
62 d/control etc. named by reference somehow
69 Ian Jackson <ijackson@chiark.greenend.org.uk> These opinions are my own.
71 If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
72 a private address which bypasses my fierce spamfilter.