Re: git: 5cfcccf76730 - main - Revert "Import tzdata 2026b"
- In reply to: John Baldwin : "Re: git: 5cfcccf76730 - main - Revert "Import tzdata 2026b""
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 25 Apr 2026 09:44:36 UTC
> 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=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. > 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