Hi, On Mon, Mar 11, 2019 at 01:30:15AM +0100, Nicolas Braud-Santoni wrote: > Package: git-buildpackage > Version: 0.9.13 > Severity: normal > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA512 > > Hi, > > I'm trying to import am existing package in git, with the caveat that I > already > set up the upstream branch and tags -- I want to base it off upstream's git > history, so I can easily cherry-pick patches. > > Unfortunately, when running `gbp import-dscs --debsnap` I ran into two > issues:
I don't think that use case is well supported yet. > > 1. The current content of the branch are overwritten, including > debian/gbp.conf, > and so gbp stops observing parameters set there. > > It is easily worked around by passing those parameters on the CLI, but gbp > should probably read its configuration once and keep it in memory through > the > whole execution. You can ignore all repo's gbp.conf via `--ignore-repo-config` but that won't help since the existing one isn't read either. You can run gbp-import-dsc for each version individually which will make it pick up the right config. > 2. gbp import-dscs will overwrite existing upstream branch and tags. > > The behaviour I expected would have been to keep the existing tags, > and import the content of debian/ in the packaging branch (along with > adding > the necessary data for pristine-tar). I would have expected it to overwrite branch content but not tags since we don't pass --allow-same-version and that would only affect debian tags anyway. Do you have a testcase that shows how tags are "overwritten". I'm happy to take patches to improve the situation otherwise running gbp-import-dscs on an empty repo and adding the existing package as a remote should work better. Cheers, -- Guido
