Re: Survey: git packaging practices / repository format

[David Bremner <david@tethera.net>]

Ian Jackson <ijackson@chiark.greenend.org.uk> writes:


>
>  Main packaging     Delta from upstream     Tools for manipulating
>   git branch         represented as          delta from upstream,
>   contains                                   building .dsc, etc.
>
>  Unmodified         debian/patches             gbp, gbp pq
>   upstream files,    (only)                    quilt / dquilt
>  plus debian/*                                 Manual patch editing
>  incl. d/patches
>
>  Modified           Direct changes             git merge
>   upstream files,    to upstream files          (.dsc: 1.0-with-diff or
>  plus debian/*.                                 single-debian-patch)
>  Maybe d/patches, depending.
>  History has direct merges from upstream.

With modified upstream files in the main branch, plus debian/*, but
usually no d/patches I use a seperate (manually
rebased) branch for patches, and export those at dsc creation time using
a gitpkg hook

With unmodified upstream files in the main branch, plus debian/*, but
usually no d/patches, I use git-debcherry to generate a quilt series at
dsc build time.