Date: Fri, 24 Apr 2026 12:04:47 -0400 From: John Baldwin <jhb@FreeBSD.org> To: Cy Schubert <Cy.Schubert@cschubert.com>, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5cfcccf76730 - main - Revert "Import tzdata 2026b" Message-ID: <6fdfa3fb-283c-465e-809e-146bb2b0845e@FreeBSD.org> In-Reply-To: <aeo-iqnCo8b-VKmn@rincewind.trouble.is> References: <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org> <20260423154235.652AB283@slippy.cwsent.com> <aeo-iqnCo8b-VKmn@rincewind.trouble.is>
index | next in thread | previous in thread | raw e-mail
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=5cfcccf767304b874c98b8c991ed3db2 >>> 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. -- John Baldwinhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6fdfa3fb-283c-465e-809e-146bb2b0845e>