Hi, On Wed, Jan 28, 2026 at 03:16:11PM +0100, Markus Blatt wrote: > Hi, > > Am Wed, Jan 28, 2026 at 02:59:53PM +0100 schrieb Guido Günther: > > On Wed, Jan 28, 2026 at 01:52:06PM +0100, Markus Blatt wrote: > > > Hi, > > > > > > I am trying to convert some of Packages to git-buildpackage and am > > > struggling a bit about how to do that > > > with an upstream branch. > > > > You implicitly still have an upstream branch when you track upstream > > git: The branch you get from upstream the tags are on. Just use that as > > `upstream/latest` > > No, I don't. Upstream uses different release branches for their releases e.g. > 2.10.* is on releases/2.10, 2.11.* on releases 2.11.*, > while development is in master. > > Hence I would need to create such a branch. I actually started with such a > branch when experimenting with another package > and the merged the upstream releases there and resolved conflicts.
Unrelated to the question but maybe useful as you likely have the same merge conflict issues on the packaging branch: `gbp import-ref` is there to import upstream git refs no matter what is currently on the Debian branch. > > Then I read that I don't need such a branch if upstream uses git. Maybe that > only holds of all releases are done > on one branch, though. Yes, that branch is purely optional. If you set `--upstream-branch=''` gbp-push should just ignore it. Cheers, -- Guido > > So I guess that I should create an upstream-branch to save fellow developers > from surprises. > > Best, > > Markus > > _______________________________________________ > git-buildpackage mailing list > [email protected] > http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage > _______________________________________________ git-buildpackage mailing list [email protected] http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
