From owner-freebsd-git@freebsd.org Fri Dec 18 04:38:40 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3213B4AF010 for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cxx2S0p5nz3kqB for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 197954AF00F; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 193D44AF100 for ; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cxx2S09Tvz3l34; Fri, 18 Dec 2020 04:38:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f176.google.com (mail-yb1-f176.google.com [209.85.219.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E822F2A7C4; Fri, 18 Dec 2020 04:38:39 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f176.google.com with SMTP id y4so835912ybn.3; Thu, 17 Dec 2020 20:38:39 -0800 (PST) X-Gm-Message-State: AOAM533S0hF+s0+f/bxKxv5iEMSQZr5U15vOC6BmI+We+mRnyz4wCWAf fpm+V/3+IfqMzDQkYNs5BijOEBeAp4svBXNdhdM= X-Google-Smtp-Source: ABdhPJzUnCc0Kzl3lS4jIZdCqd0+MP6Tbyrq+xh45haMBk5lGYouAaNjH5B/i8tOX9Ix+K7FnnqB1rdhWSTNciPjxMo= X-Received: by 2002:a25:9981:: with SMTP id p1mr3641936ybo.241.1608266319506; Thu, 17 Dec 2020 20:38:39 -0800 (PST) MIME-Version: 1.0 References: <385AFFEC-CBBD-4715-B6B2-3D06F67B4969@freebsd.org> In-Reply-To: From: Li-Wen Hsu Date: Fri, 18 Dec 2020 12:38:28 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Imminent tzdata import (was: Re: Vendor Imports in Subversion) To: Philip Paeps Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Dec 2020 04:38:40 -0000 On Fri, Dec 18, 2020 at 11:36 Philip Paeps 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 > >> 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 >