Package: git-buildpackage
Version: 0.6.22

Hi, I've been practising packaging in git, and practising
transitioning package which are not maintained in git to git repos.

One issue I've encountered is that with both gbp import-dsc, and more
worrisomely gpb import-dsc --debsnap, the import merges bpos onto the
master branch.

Create local copy of package git repo, either by cloning or by gpb
import-dsc --debsnap
gbp import-dsc of the bpo
# in another shell, git log, to get the gpb import-dsc-created commit message
git checkout --orphan jessie-backports
git add -A
git commit (paste commit message)
git checkout master
git reset --hard HEAD^ (removes the bpo changes and history from master).

This gets tricky when there are multiple historical bpos...but for
simple cases it seems to work reliably.  If gbp import-dsc could
detect a bpo and do this after an import for
somepackage-someversion.dsc...well, while that might work, it would be
better if it detected the bpo from the outset.

To transition a import-dsc --debsnap to a git repo where bpo versions
are only referenced by tags:

Check to see if branch debian_version-backports already exists
Merge bpo versions to appropriate branch
if the debian_version-backports branch did not exist, then delete it now.

This proposal keeps the master branches history free from bpo version,
which shouldn't ever be there.  If it's too pedantic in its efforts to
be correct, please consider an alternative method where
--debian-branch=$BRANCH is configured per-dsc.

I believe this also affects v0.7.5.

Kind regards,
Nicholas

Reply via email to