On 4/29/19 11:18 AM, Gard Spreemann wrote: > Hi, > > For one of my packages, I maintain two public git branches: one is > upstream/latest, where I've been importing upstream's released tarballs, > and the other is debian/sid that contains the packaging. > > Recently, upstream has finally started using git. What is the > recommended way for me to maintain a sane branch structure for the > packaging repository while starting to use upstream's git master as the > upstream branch to follow? > > (My first thought is to track upstream's master as upstream/latest-git > or something, and start merging from that into debian/sid, but I don't > know if there's a better way.) > > > Best, > Gard
What I found the most easy way is to just use whatever branching names upstream is using, and *never* store them in Salsa. If you need upstream repository, you can simply run a ./debian/rules fetch-upstream-remote, and most of the time, the only thing you need, is merging a tag. What I push to Salsa are upstream tags only, which is enough. Cheers, Thomas Goirand (zigo)