Differences between revisions 3 and 4
Revision 3 as of 2019-07-05 15:33:47
Size: 1341
Editor: SeanWhitton
Comment: follow <20190701100927.GA23353@espresso.pseudorandom.co.uk>
Revision 4 as of 2019-07-05 15:34:01
Size: 1348
Editor: SeanWhitton
Comment: add bullet point
Deletions are marked like this. Additions are marked like this.
Line 39: Line 39:
 *

The unapplied branch format is the most commonly used branch format.

Branch format

  • A git clone of the packaging branch contains
    • all files under debian/ in the uploaded source package, such as debian/control

    • all upstream files, e.g. Makefile

  • If Debian has patched any of the upstream files, e.g. Makefile,

    • those changes appear as a quilt patch series, in debian/patches/

    • they do not appear in the copy of the upstream files in a git clone of the packaging branch

      • e.g. Makefile will not have debian/patches/ applied to it.

  • There is no particular git history required, so long as it is fast-forwarding.
  • The upstream source is obtained from either upstream's release tags or tarball imports.
  • The .dsc format is 3.0 (quilt).

  • dgit push supports this workflow with --quilt=gbp or --quilt=unapplied.

Common workflow elements

gbp-pq(1) or quilt(1)

Used to edit the delta queue i.e. the contents of d/patches.

git-format-patch(1)

To add patches to d/patches.

Advantages

Disadvantages

  • Working tree repeatedly dirtied by application of patches.
  • Editing delta queue with the full power of git (i.e. gbp-pq(1)) requires switching to a temporary local branch