Date: Thu, 7 Mar 2024 10:04:53 -0800 From: Warner Losh <imp@bsdimp.com> To: Gleb Smirnoff <glebius@freebsd.org> Cc: "Bjoern A. Zeeb" <bz@freebsd.org>, freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <CANCZdfpP30vo38ArPLe8DyHDpY8F7pexFMKt9RJsqBmEqniung@mail.gmail.com> 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
--00000000000038985e061315ea25 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 7, 2024 at 9:58=E2=80=AFAM Gleb Smirnoff <glebius@freebsd.org> = 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). i= n > 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, s= o > 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. > It's for the downsides that we don't do this in the FreeBSD tree except for zfs. And even there it causes problems with bisecting. > 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. > It also would bloat the cloned FreeBSD repo. We already have enough bloat there w/o unduly adding to it. > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. > I'd rather we just import the couple of versions we have in the tree. While the full history might theoretically be useful, I don't think it is warranted in this case. Warner --00000000000038985e061315ea25 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">= <div dir=3D"ltr" class=3D"gmail_attr">On Thu, Mar 7, 2024 at 9:58=E2=80=AFA= M Gleb Smirnoff <<a href=3D"mailto:glebius@freebsd.org">glebius@freebsd.= org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg= in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e= x">On Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote:<br> W> If we imported each of the versions (exclusive of the cherry-picks). = in<br> W> order and<br> W> then merged, this would give us a better history. The commit messages= of<br> W> the old<br> W> versions could include the hash where it was committed to the tree= 9;s main<br> W> branch.<br> W> This might be wise, since it would allow us to add these links in the= <br> W> future if that<br> W> functionality is added to git (or someone cures me of my ignorance). = I<br> W> think that<br> W> if these versions were trivial to get, we should do it. If they are a= <br> W> hassle, then we<br> W> can forego them. The possible future benefit is speculative at best, = so if<br> W> there's<br> W> more than a tiny amount of hassle, we should skip doing each version.= <br> <br> Well, if the upstream is a true git repo, then we don't need to care<br= > about versions, we can take it with full history as 'subtree add'.<= br> Then, replay our commits on top. The downside is that each file will<br> have two histories, and it would require some effort when you call<br> git log to get the correct one. The repo bloat will not be large as<br> the objects would be the same, it would be only extra commits metadatas.<br= ></blockquote><div><br></div><div>It's for the downsides that we don= 9;t do this in the FreeBSD tree except for</div><div>zfs. And even there it= causes problems with bisecting.</div><div>=C2=A0</div><blockquote class=3D= "gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(2= 04,204,204);padding-left:1ex"> This all will look like a small version of what we have at Netflix,<br> where we followed unofficial FreeBSD git repo and then switched to<br> the official one. In practice it seems to work well, although a<br> perfectionists would not like doubled commits deep in the past.<br></blockq= uote><div><br></div><div>It also would bloat the cloned FreeBSD repo. We al= ready have</div><div>enough bloat there w/o unduly=C2=A0adding to it.</div>= <div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px = 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Bjoern, can you please point me at upstream source of truth?<br> Is it a repo, or what is it.<br></blockquote><div><br></div><div>I'd ra= ther we just import the couple of versions we have in the tree.</div><div>W= hile the full history might theoretically be useful, I don't think it</= div><div>is warranted in this case.</div><div><br></div><div>Warner</div></= div></div> --00000000000038985e061315ea25--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpP30vo38ArPLe8DyHDpY8F7pexFMKt9RJsqBmEqniung>