Date: Thu, 7 Mar 2024 18:04:05 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@freebsd.org> To: Gleb Smirnoff <glebius@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> In-Reply-To: <ZeoAN5y_gXwxbhan@cell.glebi.us> References: <n4p4714r-2n97-psq3-34p2-887qq0o1354q@SerrOFQ.bet> <CANCZdfpDDx=riEdExdpzmr6DHy7%2Bgpifm_1aJMcmGiSYAeVrgw@mail.gmail.com> <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <Zeig9nKD-Onc58T1@cell.glebi.us> <CANCZdfqxF-oQvc_W1jMKs=F5SE13_NmtvFOnPetr5JH6fBcPaA@mail.gmail.com> <nr98n9r4-58r6-rn91-1p01-58q56260rn66@serrofq.bet> <CANCZdfpyDQPcm2O6tzF4M91u7Pw_XhA5ihpCMON8=w7-YLezpw@mail.gmail.com> <q31p1656-6r83-0099-495p-7or9377s4131@serrofq.bet> <CANCZdfrsY93UyEGo=_6X%2BpmSfAKV2LgnUZHbC6x-po0mJv0KCg@mail.gmail.com> <ZeoAN5y_gXwxbhan@cell.glebi.us>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, 7 Mar 2024, Gleb Smirnoff wrote: > On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: > W> If we imported each of the versions (exclusive of the cherry-picks). in > W> order and > W> then merged, this would give us a better history. The commit messages of > W> the old > W> versions could include the hash where it was committed to the tree's main > W> branch. > W> This might be wise, since it would allow us to add these links in the > W> future if that > W> functionality is added to git (or someone cures me of my ignorance). I > W> think that > W> if these versions were trivial to get, we should do it. If they are a > W> hassle, then we > W> can forego them. The possible future benefit is speculative at best, so if > W> there's > W> more than a tiny amount of hassle, we should skip doing each version. > > Well, if the upstream is a true git repo, then we don't need to care > about versions, we can take it with full history as 'subtree add'. > Then, replay our commits on top. The downside is that each file will > have two histories, and it would require some effort when you call > git log to get the correct one. The repo bloat will not be large as > the objects would be the same, it would be only extra commits metadatas. > > This all will look like a small version of what we have at Netflix, > where we followed unofficial FreeBSD git repo and then switched to > the official one. In practice it seems to work well, although a > perfectionists would not like doubled commits deep in the past. > > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. yes, it's three or four or five different repos with the full linux kernel in it; nothing you want. And I believe we do not do subtrees in FreeBSD official. I'll go and prepare the different versions locally the next days for each driver and then we can see. /bz -- Bjoern A. Zeeb r15:7
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8n0r562s-non1-5269-p649-2s8rr05op914>