Re: Git branch layout for packages requiring DFSG-cleaning

Hi,

Which package are you working on? Do you use
debian/copyright:Files-Exclude lines to remove upstream files? Do you
do the import with `gbp import-orig --uscan`? Is your debian/gbp.conf
configured to import upstream-vcs-tag or are you otherwise tracking
upstream git?

In pretty much all cases, I would have debian/latest represent the
upstream version used to generate the upstream tarball.tar.gz that was
uploaded to Debian, regardless of whether it is repacked or not. The
parent commit of the upstream/latest might contain the real unmodified
upstream git contents and that diff will show the differences to
upstream regardless of whether repackaging or upstream tarball and git
differences at play. The Debian gbp git repo layout is already
slightly over-engineered, and thus I recommend against adding more
branches.

However, whatever you decided to do, remember to have a
debian/gbp.conf that documents the layout correctly so other
maintainers can just run `gbp import-orig --uscan` and it will result
in the same behavior as what you wanted to be done.

- Otto