Hi! On Tue, 15 Oct 2024 at 05:47, Joachim Zobel <jz-2...@heute-morgen.de> wrote: > > Am Dienstag, dem 15.10.2024 um 00:09 -0700 schrieb Otto Kekäläinen: > > I suspect you have something wrong with the branch structure, perhaps > > you are trying to remove files in actual upstream branch and not the > > "upstream import" branch that has only one-way changes. > > The repository has an upstream branch and a debian branch. The upstream > branch is pulled via git from upstream. > > Sinerely, > Joachim > > This is about https://salsa.debian.org/debian-iot-team/mosquitto
I can see https://salsa.debian.org/debian-iot-team/mosquitto/-/blob/debian/master/debian/gbp.conf that has: [DEFAULT] debian-branch=debian/master upstream-branch=master filter=*/.git upstream-tag=v%(version)s There is no README.source so I am not sure how you do the import, but based on https://salsa.debian.org/debian-iot-team/mosquitto/-/commit/5d08142299dc7a7db79883a2fcdc615eb326817c you merged branch 'master' directly on 'debian/master'. If you need to repack, you should have a spearate branch 'upstream/latest' as the targets for merges from upstream tags, and then from 'upstream/latest' you merge on 'debian/master' (which following DEP-14 should be 'debian/latest' btw). [DEFAULT] debian-branch = debian/latest upstream-branch = upstream/latest upstream-tag = upstream/%(version)s upstream-vcs-tag = v%(version%~%.)s Note that the upstream-branch and upstream-tag refers to things created by Debian to reference the incoming upstream stuff. Only the upstream-vcs-tag should point to something that actually already exists in the upstream repository https://github.com/eclipse/mosquitto/ you are pulling from. To make it more clear, perhaps git-buildpackage should rename these to import-branch and import-tag so people won't use upstream-branch=master like you did, as it isn't supposed to mean the actual upstream master branch, only the branch used for the package in Debian. Note: I didn't test this setup, I am just writing about what I assume the setup should be, but it should still be tested to validate it works in your use case.
