Vendor Imports in Subversion
manu at bidouilliste.com
Thu Dec 10 10:45:41 UTC 2020
On Wed, 9 Dec 2020 17:25:48 -0700
Warner Losh <imp at bsdimp.com> wrote:
> On Wed, Dec 9, 2020 at 5:54 AM Emmanuel Vadot <manu at bidouilliste.com> wrote:
> > On Tue, 8 Dec 2020 23:47:18 -0700
> > Warner Losh <imp at bsdimp.com> wrote:
> > > Greetings,
> > >
> > > The git working group is making final preparations for the cut over in
> > two
> > > weeks (currently planned to start December 19). There's one item that's
> > > caused some recent problems that we'd like to ask the committer's help
> > on:
> > > vendor imports. We've had a few vendor imports of late that have caused
> > > problems for the git converter. Imports should be done from the top level
> > > so that the merge info winds up in the right place. uqs@ has added code
> > to
> > > defensive code to detect the recent problems, but we're not sure it will
> > > catch everything.
> > >
> > > So, over the next two weeks, we'd like to ask that committers refrain
> > from
> > > doing vendor imports in the src tree for those cases where delay is
> > > possible. For vendor imports that can't wait, due to security or other
> > > serious issues, please coordinate with git at freebsd.org before doing the
> > > vendor import. If there's a confidential matter, you can contact me (
> > > imp at freebsd.org) or the core team instead.
> > >
> > > Thanks for your understanding...
> > >
> > > Warner
> > > On behalf of the git working group
> > So,
> > I wanted to import 5.9 and 5.10 dts before 13.0 and also before the
> > switch to git to be sure that I did not screw things up.
> > Also I don't see how vendor imports are supposed to work with git
> > subtree, I admit that I have only a recent and limited experience with
> > subtree.
> OK. I'm nervous about this, but I know you've done them in the past. When
> is 5.10 supposed to be golden so we can import it?
5.10 is at -rc7 right now so I guess in a week or two it will be
> > The other problem is that for dts we import everything from
> > upstream but only merge part of it (include, arm, arm64 and riscv
> > directory), is that supported ?
> > More generaly is there a write up on how to use subtree for vendor
> > import already written ?
> I'm working on that writeup. I believe it is possible, but I've not yet
> come to that part of the write up.
Ok, please let me know when you have at least something written for
generic vendor import with subtree, I can do test then.
> freebsd-hackers at freebsd.org mailing list
> To unsubscribe, send any mail to "freebsd-hackers-unsubscribe at freebsd.org"
Emmanuel Vadot <manu at bidouilliste.com>
More information about the freebsd-hackers