Date: Wed, 10 Jun 2020 09:56:30 -0400 From: Ed Maste <emaste@freebsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Cy Schubert <Cy.Schubert@cschubert.com>, freebsd-git@freebsd.org Subject: Re: Beta git conversion available for experimentation Message-ID: <CAPyFy2CazGBD4%2BfUBKfHuHG6gBcONWL8iMCO-QTfYxCahg51GA@mail.gmail.com> In-Reply-To: <CANCZdfrm_7G30OwiN8Kh-ZiiodH6hn3PM1sc0L0a7bn55LNsow@mail.gmail.com> References: <CAPyFy2DbqKX140qQbMuywA6Htt23%2B1K%2BaN7jitVH7qG4dkEFMA@mail.gmail.com> <202006092232.059MWWao074759@slippy.cwsent.com> <CANCZdfrm_7G30OwiN8Kh-ZiiodH6hn3PM1sc0L0a7bn55LNsow@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 9 Jun 2020 at 18:48, Warner Losh <imp@bsdimp.com> wrote: > > On Tue, Jun 9, 2020 at 4:32 PM Cy Schubert <Cy.Schubert@cschubert.com> wrote: >> >> Do we have any doc on managing contrib using the git model? > > We're working on our suggested best practices. We're making sure that the early testing we did to come up with the basics can be replicated easily enough for it to be practical. > > There will be a doc going over all the following in detail, but here's the outline. > > git subtree allows one to merge in other repos into our main repo w/o users of that repo needing to grab the merged in repos. We plan on making what we call vendor branches today vendor repos. We'd then do a git subtree merge from that repo as it tracks upstream. Also, I described my first experiments with git subtree earlier: https://lists.freebsd.org/pipermail/freebsd-git/2020-January/000221.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2CazGBD4%2BfUBKfHuHG6gBcONWL8iMCO-QTfYxCahg51GA>