Date: Fri, 18 Dec 2020 12:38:28 +0800 From: Li-Wen Hsu <lwhsu@freebsd.org> To: Philip Paeps <philip@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, git@freebsd.org Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) Message-ID: <CAKBkRUwjH5PpbY12z42FA7%2B4SeeyU5xoRNLFNUywr4h1-1Uchg@mail.gmail.com> In-Reply-To: <B5A91BCA-EBD0-4378-9409-6075E145F495@freebsd.org> References: <CANCZdfoFHEVk0mYh33YwaxK8MdZ%2BfHc%2BZ-ZROdsOk3QY90S4jQ@mail.gmail.com> <CCF94499-C9EE-49C1-B109-C6D2629C5BB2@freebsd.org> <CANCZdfoKuBEByQCGhrPYb19cq4X61fcfnYxzo6kB4jB=H7Ncjw@mail.gmail.com> <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> <B5A91BCA-EBD0-4378-9409-6075E145F495@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 18, 2020 at 11:36 Philip Paeps <philip@freebsd.org> wrote: > On 2020-12-10 00:18:23 (+0800), Philip Paeps wrote: > > On 2020-12-09 23:48:37 (+0800), Warner Losh wrote: > >> On Wed, Dec 9, 2020 at 1:16 AM Philip Paeps <philip@freebsd.org> > >> wrote: > >>> On 2020-12-09 14:47:18 (+0800), Warner Losh wrote: > >>>> 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@freebsd.org before doing the vendor import. If there's a > >>>> confidential matter, you can contact me (imp@freebsd.org) or the > >>>> core team instead. > >>>> > >>>> Thanks for your understanding... > >>> > >>> I expect there will be one more tzdata import this year. Probably > >>> in the next week or so. > >>> > >>> I could potentially hold this one off, but one of the timezones in > >>> Russia is changing at short notice and we do have a sizeable number > >>> of users in Russia. > >>> > >>> https://mm.icann.org/pipermail/tz/2020-December/029607.html > >>> > >>> It sounds like the timezone is changing on 27 December 2020 (argh) > >>> but we won't know for sure until next week (argh argh). > >>> > >>> Given that tzdata imports are exceedingly trivial, perhaps this is > >>> actually a best-case first import to try out the process? Happy to > >>> coordinate with you guys. > >> > >> Thanks Philip for the heads up. This is the sort of timely data that > >> makes sense not to delay. You've done a number of these in the past, > >> so this should be OK. Please take extra care to ensure that the > >> mergeinfo properties are done correctly at the high level. > >> Unless someone else pipes up, please consider this approved. We're > >> planning to start the conversion of December 19, so please try to > >> have it done well ahead of that, iana willing :). > > > > Thank you! > > > > I'll merge the new tzdata (with extra care and double checking) on the > > same day it comes out if it's before the 19th. If it comes out early > > next week, I'll give it the usual couple of days in HEAD before I MFC > > it. If it comes out closer to the 19th, I'll MFC it a bit sooner so > > 1) the dust has a bit of time to settle before the Git migration and > > 2) affected users get it sooner. I'm cautiously optimistic it'll come > > out next week, so it'll be business as usual for me. > > > > If the tzdata release does end up only happening after the 19th ... > > well ... we'll attack that dragon when it shows its tail. :-) > > > > I'll keep git@ posted whatever happens. > > It looks like the tzdata release won't happen before we move to Git. It > will probably happen shortly after we move. > > Is there some documentation (in the works) about how to do a vendor > import in the Git world? The WIP doc is at https://github.com/bsdimp/freebsd-git-docs/blob/main/vendor.md And if possible, I encourage you test the workflow with the test/develop area, described in the =E2=80=9Cclone=E2=80=9D section of https://cgit-dev.= FreeBSD.org/src. Best, Li-Wen >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAKBkRUwjH5PpbY12z42FA7%2B4SeeyU5xoRNLFNUywr4h1-1Uchg>