Date: Tue, 5 Mar 2024 15:23:34 -0800 From: Warner Losh <imp@bsdimp.com> To: "Bjoern A. Zeeb" <bz@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: <CANCZdfpDDx=riEdExdpzmr6DHy7%2Bgpifm_1aJMcmGiSYAeVrgw@mail.gmail.com> In-Reply-To: <n4p4714r-2n97-psq3-34p2-887qq0o1354q@SerrOFQ.bet> References: <n4p4714r-2n97-psq3-34p2-887qq0o1354q@SerrOFQ.bet>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000002b40120612f222a5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Mar 5, 2024 at 2:46=E2=80=AFPM Bjoern A. Zeeb <bz@freebsd.org> wrot= e: > Hi, > > there's the edge case when we already have code in contrib which was > previously directly committed and now should come out of a vendor > branch. > > (1) how does one properly seed that case? > Was it direct committed to contrib? Or somewhere else? If you are moving it to contrib, just follow the process in the handbook + delete the old code in the same commit as you merge the vendor branch in (so the old history will be available more often)... If it was direct committed to contrib, then it's a vendor import + subtree merge + maybe fixups for FreeBSD. Vendor merges are just a convenience so that future vendor events are constrained... These details likely need to be documented, but what's the details here tha= t you need to do? > (2) given I couldn't see that mentioned either anywhere, for local > changes, they only live in main and stable/ but vendor doesn't have them > so in case of conflict they'll show up with the merge from vendor to > main and need to be resolved then? > stable branches don't care about vendor branches (except in some rare cares that almost certainly won't pop up here). You are just merging changes in main, via cherry-picking, into stable. Warner --0000000000002b40120612f222a5 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 Tue, Mar 5, 2024 at 2:46=E2=80=AFP= M Bjoern A. Zeeb <<a href=3D"mailto:bz@freebsd.org">bz@freebsd.org</a>&g= t; wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0p= x 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi,<br= > <br> there's the edge case when we already have code in contrib which was<br= > previously directly committed and now should come out of a vendor<br> branch.<br> <br> (1) how does one properly seed that case?<br></blockquote><div><br></div><d= iv>Was it direct committed=C2=A0to contrib? Or somewhere else? If you are m= oving it</div><div>to contrib, just follow the process in the handbook=C2= =A0+ delete the old code in the</div><div>same commit as you merge the vend= or branch=C2=A0in (so the old history will be</div><div>available more ofte= n)...</div><div><br></div><div>If it was direct committed to contrib, then = it's a vendor import=C2=A0+ subtree merge</div><div>+ maybe fixups for = FreeBSD. Vendor merges are just a convenience so that</div><div>future vend= or events are constrained...</div><div><br></div><div>These details likely = need to be documented, but what's the details here that</div><div>you n= eed to do?</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-le= ft:1ex"> (2) given I couldn't see that mentioned either anywhere, for local<br> changes, they only live in main and stable/ but vendor doesn't have the= m<br> so in case of conflict they'll show up with the merge from vendor to<br= > main and need to be resolved then?<br></blockquote><div><br></div><div>stab= le branches don't care about vendor branches (except in some rare cares= </div><div>that almost certainly won't pop up here). You are just mergi= ng changes in main,</div><div>via cherry-picking, into stable.=C2=A0</div><= div><br></div><div>Warner</div></div></div> --0000000000002b40120612f222a5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpDDx=riEdExdpzmr6DHy7%2Bgpifm_1aJMcmGiSYAeVrgw>