Hi, On Thu, 25 Jan 2018, Michael Stapelberg wrote: > > I think that if you want to change this, then we should discuss it on > > debian-devel. > > > > If everything comes down to the fact that you don't find a good name, I'm > > happy to throw a few suggestions: > > What about "pristine-upstream" or "original-upstream" or "upstream.orig" > > or "uptream.real" for the non-filtered upstream branch ? > > > > None of these fit with DEP14, unless I’m misunderstanding the following > paragraph? > > If the Git workflow in use imports the upstream sources from released > tarballs, this should be done under the "upstream" namespace. By default, > the latest upstream version should be imported in the upstream/latest > branch and when packages for multiple upstream versions are maintained > concurrently, one should create as many upstream branches as required. > > So, are you suggesting upstream/pristine?
Not really. I was just saying that if you want to have upstream/* host non-filtered sources, then we should have a broader discussion on debian-devel because it's not compatible with the current version of the DEP. On the other hand, if you wanted to do this only because you could not find a better name (outside of upstream/*) for the unfiltered version, then I made a few suggestions of names that could be acceptable IMO. > Thinking about it, my suggestions would be: > > • branch “upstream/latest” tracks an upstream branch, e.g. remote > “upstream”, branch “master”. > > • branch “upstream/latest-filtered” contains a filtered version of that > branch, whose commits would be tagged e.g. upstream/1.0+dfsg1 so that > gbp-buildpackage picks the correct commit. > > I think that complies with DEP14 as good as possible, and is still > reasonably clear for casual users. Thoughts? I would use "upstream-filtered/latest" for the latter. You have clean namespace separation. But this still changes the assumption about upstream/latest (non-filtered now) so it needs a broader discussion IMO. I'm not opposed to it. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: https://www.freexian.com/services/debian-lts.html Learn to master Debian: https://debian-handbook.info/get/
