On Tue, Oct 15, 2024 at 07:30:57PM -0700, Otto Kekäläinen wrote: > 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).
And if upstream/latest has a file removed while master has that file modified, there will be a conflict. > 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. Using the upstream tags directly is officially supported: https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.upstream-git.html#gbp.import.upstream.git.notarball -- WBR, wRAR
signature.asc
Description: PGP signature
