Date: Fri, 23 Apr 2021 22:24:47 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> To: Martin Matuska <mm@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, freebsd-git <freebsd-git@freebsd.org> Subject: Re: OpenZFS imports, status update Message-ID: <YIMtD4SA9e9VTsez@acme.spoerlein.net> In-Reply-To: <aed58350-a351-7fb0-ee22-daa6d41ed2c9@FreeBSD.org> References: <CANCZdfrM5rKo6AKhHMCbp3O8ZoxqCkGNT3aRrSwE%2B6HzS7MDJA@mail.gmail.com> <aed58350-a351-7fb0-ee22-daa6d41ed2c9@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Wouldn't vendor/openzfs/master simply be an alias for openzfs/master and it would be the pristine upstream source repo? Or do we have local modifications in our vendor/openzfs/master, if so, ignore me. On Fri, 2021-04-23 at 02:50:57 +0200, Martin Matuska wrote: >Hi Warner, > >thank you very much for the update. > >If I understand this correctly, the way to go in the future is a 1:1 >merge from openzfs/master to e.g. vendor/openzfs/master and from >openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a >second step a subtree merge from vendor/openzfs/* to main or stable/13? > >Martin > >On 22. 4. 2021 20:34, Warner Losh wrote: >> Hey Martin, >> >> I just wanted to let you know we've been working towards enabling >> pushing vendor/openzfs/* branches. There's one big issue that needs to >> be corrected. Currently, we'll do one email per revision hash on such >> imports, so openzfs would generate ~10k emails, which would be >> undesirable. Li Wen is working on enabling one email per push for >> vendor/* which would eliminate this problem. We hope to be doing test >> pushes to the testing repo early next week, and if all goes well >> enabling this in production shortly after. >> >> IMHO, you've made a compelling case: the size is small, the coupling >> between the projects is tight and we get some extra benefit from >> having a finer-grained vendor branch that we import from. The plan to >> import directly from vendor/openzfs/zfs-2.1 would normally be >> concerning because it's not following the usual main -> stable/X >> workflow. In this case, though, since upstream follows that workflow >> we won't lose things that get pushed to stable/13 that aren't also >> relevant to main. There's at least some configuration needed to allow >> the merge commits to stable/13, but we're still working out the last >> details. >> >> So we'll be good to go soon (1-2 weeks until you can land commits, I >> think). Does that work for you? >> >> Warner >> > >_______________________________________________ >freebsd-git@freebsd.org mailing list >https://lists.freebsd.org/mailman/listinfo/freebsd-git >To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YIMtD4SA9e9VTsez>