Re: Understanding Git workflow around DEP-14
On Mon, 11 Mar 2019 10:42:35 -0700,
deb251@lewenberg.com<deb251@lewenberg.com> wrote:
>I am packaging some upstream software for Debian and I am trying to
>understand the workflow around "DEP-14: Recommended layout for Git
>packaging repositories".
>
>Looking at DEP-14 I might have these Git branches:
>
> master
> debian/master
> debian/stretch
> upstream/latest
>
>I understand that the Debian packaging files in debian/ will appear in
>the "debian/*" branch, but my general question is: what is the
>workflow around all these branches? When and how do files get merged
>from one branch to another?
>
In addition to what Matt and Geert has written:
>
>More specifically:
>
>1. Besides the debian/ directory, what is the difference between the
>"debian/master" branch and the "upstream/latest" branch?
debian/master is where your packaging work happens in the debian
folder, and also where the building of the package happens. (Here you
also should have the upstream source merged, to be able to build the
package with the standard debuild or dpkg-buildpackage).
upstream/latest (this branch is sometimes simply called upstream) is
most often used for unpacked upstream release tarballs. If you have a
pristine-tar branch, you can recreate the upstream tarball from these
two branches).
>2. What should the "master" branch be used for?
It can be used for upstream git branch from the upstream git repository
- this can be useful if you have imported an upstream version from a
tarball, and simply want to cherry-pick an upstream fix from a commit
that was just a tiny bit too late for the upstream release.
>
>3. When a new upstream tarball is released, where should it be
>imported? In "upstream/latest"? In "debian/master"? Both?
>
Simply use gbp import-orig - Its man-page mentions:
>The sources are placed on the upstream branch (default: upstream),
>tagged and merged onto the debian branch (default: master).
and I only have the addition that the defaults simply can be changed
using a debian/gbp.conf to match DEP-14.
-- Andreas Rönnquist
mailinglists@gusnan.se
andreas@ronnquist.net
Reply to: