From nobody Sat Apr 25 09:44:36 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4g2lKp6cmTz6b9bd; Sat, 25 Apr 2026 09:44:46 +0000 (UTC) (envelope-from zlei@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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2lKp5lzkz3qfp; Sat, 25 Apr 2026 09:44:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777110286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Hi/z58gOD36RJFV7HhHEsQKwjpRJdiTtL7r5q75Zx8w=; b=FCb3Pccw4YQvku9FP49PCvUaw0x2ptn1Z/+ckeP08+FmW/TUTqH1e9/VPBygJZgY+4BUBF GWspk78pQ2kf2Pm94OrdB1W5bPof1/ZKqcf04bk1rFoA6vFwrxHCrCe565lUiFjoYARX9k bEBasbSnjbitfZ4X+AviskiqNhb1z+PHl2GzQg/TQ05KCE40a4U4gdv9nETu4Ux0O3iawX kgVV7E1AlTvXPwMRkMK4p5D7zmBQXSFA+fPyB5PNQTIEuIiKiwhRyDbrcdr6h2J754wk76 O4Iqo2dzTbzQopKW2BUs2zEfmFUN1RMRG/Se1FxsVEuFjVktUP2dCfjk4288Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777110286; a=rsa-sha256; cv=none; b=v+s2Aq8QAR/sjfQYkIaFLjko4/l02Pk54I/5n92/r+hnogN8K5VCxd/xkAwjfveFf1gFjg ut1HJlgUsKrO46MYAitVR2fAf6m/d9H5oR0qfTsZCG2o+U6/pz2RfSnZ7T5jPNyPm6dido UEoI3PsqsTYPLIromHvSDlB1K8o5HdCCMi2Yc4/yIo3EAXlaWe7p3qsZKTRGo9mdHH5CnU Z4+R2r0NbhclUrsLp7+c7r0fe1xO3zH9829Yg2ZJWYqgmpfSmxb2lZaSCngXpq9U4ZPWaU FCpqHSHQGX3cj2wKqkEAk9KfpD+eHRz1POjOY2Ab8k9b/fuROS9oW++xnkt/fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777110286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Hi/z58gOD36RJFV7HhHEsQKwjpRJdiTtL7r5q75Zx8w=; b=JgSpMAV9dRkt7GG1q1kbHHBo6TSqSVGZFRK+fmNzKz57UCdMG/KdjnkXD5zL06/eD7pLpa /EkytZVEgb6VWByHwaHt7WSbgXc/ImXKHD071A6mxMbuI2H39aC/tgAauYOamCh7h1wk9f HzCVZgFZMvZ6Lry/t6ecuT7VMIuTq3wnxXdM+G0MseuNkQJSPYJHZd0cvNDW4sPzaTk40y VzIAE0vwJPJpTXZkf+HGkP9H168EGazdijZvOMfmI6eeA5RIMJJq474dbsAFICwW3COB6O 4OeAhp9NAraQ5IbEvkRhnwgu88ZkedKxpoQV53OAagO3xbbSAP2PKzGvENOlMA== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g2lKn0VLszsYk; Sat, 25 Apr 2026 09:44:44 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_83B5FF9F-5B4D-4041-8F8B-2D4F939DBBD4" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.10\)) Subject: Re: git: 5cfcccf76730 - main - Revert "Import tzdata 2026b" Date: Sat, 25 Apr 2026 17:44:36 +0800 In-Reply-To: <6fdfa3fb-283c-465e-809e-146bb2b0845e@FreeBSD.org> Cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org To: John Baldwin References: <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org> <20260423154235.652AB283@slippy.cwsent.com> <6fdfa3fb-283c-465e-809e-146bb2b0845e@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.10) --Apple-Mail=_83B5FF9F-5B4D-4041-8F8B-2D4F939DBBD4 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Apr 25, 2026, at 12:04 AM, John Baldwin wrote: >=20 > On 4/23/26 11:45, Philip Paeps wrote: >> On 2026-04-23 08:42:35 (-0700), Cy Schubert wrote: >>> In message <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org>, Philip = Paeps >>> writes: >>>> The branch main has been updated by philip: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5cfcccf767304b874c98b8c991ed3db2= >>>> 221407ec >>>>=20 >>>> commit 5cfcccf767304b874c98b8c991ed3db2221407ec >>>> Author: Philip Paeps >>>> AuthorDate: 2026-04-23 15:26:56 +0000 >>>> Commit: Philip Paeps >>>> CommitDate: 2026-04-23 15:26:56 +0000 >>>>=20 >>>> Revert "Import tzdata 2026b" >>>>=20 >>>> This reverts commit 5417f0bbde91c148b3c3982eb2ab23a675b5e8d1. >>>=20 >>> Why? >> Because Git ate the merge commit this was meant to be and turned it = into >> a mess. I did something stupid. I'll commit what I meant to commit >> shortly. Just doing another build test to make sure I don't make a = mess >> twice. :) >=20 > To Cy's point, though, it is helpful to include some note along these = lines > in revert commits that includes the "why" for the commit. In general = when > doing a git revert , please amend the commit log to add a note = for why > the change is being reverted as it isn't always obvious from the diff = itself. >=20 I'm for that. I saw many times that a commit reverted without explaining "why". A = reverted change is different from a normal change. The latter is either simple enough or explains somewhat = by the changed content, but the former is / does not. > --=20 > John Baldwin Best regards, Zhenlei --Apple-Mail=_83B5FF9F-5B4D-4041-8F8B-2D4F939DBBD4 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Apr 25, 2026, at 12:04 AM, John Baldwin <jhb@FreeBSD.org> = wrote:

On 4/23/26 11:45, Philip Paeps wrote:
On = 2026-04-23 08:42:35 (-0700), Cy Schubert wrote:
In message <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org>, Philip = Paeps
writes:
The branch main has been updated by philip:

URL: https://cgit.FreeBSD.org/src/commit/?id=3D5cfcccf767304b874c98b= 8c991ed3db2
221407ec

commit= 5cfcccf767304b874c98b8c991ed3db2221407ec
Author: =     Philip Paeps <philip@FreeBSD.org>
AuthorDate: = 2026-04-23 15:26:56 +0000
Commit: =     Philip Paeps <philip@FreeBSD.org>
CommitDate: = 2026-04-23 15:26:56 +0000

    Revert "Import tzdata 2026b"

    This reverts commit = 5417f0bbde91c148b3c3982eb2ab23a675b5e8d1.

Why?
Because Git ate the merge = commit this was meant to be and turned it into
a mess. =  I did something stupid.  I'll commit what I meant to = commit
shortly.  Just doing another build test to = make sure I don't make a mess
twice. :)

To Cy's point, though, it is helpful to include some note = along these lines
in revert commits that includes the "why" for the commit. =  In general when
doing a git revert <foo>, please amend the commit log = to add a note for why
the change is being reverted as it isn't always obvious from = the diff itself.


I'm for that.

I = saw many times that a commit reverted without explaining "why". A = reverted change is different from
a normal change. The latter = is either simple enough or explains somewhat by the changed content, = but
the former is / does not.

-- 
John = Baldwin

Best regards,
Zhenlei

= --Apple-Mail=_83B5FF9F-5B4D-4041-8F8B-2D4F939DBBD4--