Date: Sat, 25 Apr 2026 17:44:36 +0800 From: Zhenlei Huang <zlei@FreeBSD.org> To: John Baldwin <jhb@FreeBSD.org> Cc: 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: <EB8002C4-D106-433C-BA04-C8F4CDFFDE6D@FreeBSD.org> In-Reply-To: <6fdfa3fb-283c-465e-809e-146bb2b0845e@FreeBSD.org> References: <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org> <20260423154235.652AB283@slippy.cwsent.com> <aeo-iqnCo8b-VKmn@rincewind.trouble.is> <6fdfa3fb-283c-465e-809e-146bb2b0845e@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] > 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 [-- Attachment #2 --] <html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Apr 25, 2026, at 12:04 AM, John Baldwin <<a href="mailto:jhb@FreeBSD.org" class="">jhb@FreeBSD.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta charset="UTF-8" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On 4/23/26 11:45, Philip Paeps wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">On 2026-04-23 08:42:35 (-0700), Cy Schubert wrote:<br class=""><blockquote type="cite" class="">In message <<a href="mailto:69ea3ab7.36284.125e6d40@gitrepo.freebsd.org" class="">69ea3ab7.36284.125e6d40@gitrepo.freebsd.org</a>>, Philip Paeps<br class="">writes:<br class=""><blockquote type="cite" class="">The branch main has been updated by philip:<br class=""><br class="">URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=5cfcccf767304b874c98b8c991ed3db2" class="">https://cgit.FreeBSD.org/src/commit/?id=5cfcccf767304b874c98b8c991ed3db2</a><br class="">221407ec<br class=""><br class="">commit 5cfcccf767304b874c98b8c991ed3db2221407ec<br class="">Author: Philip Paeps <<a href="mailto:philip@FreeBSD.org" class="">philip@FreeBSD.org</a>><br class="">AuthorDate: 2026-04-23 15:26:56 +0000<br class="">Commit: Philip Paeps <<a href="mailto:philip@FreeBSD.org" class="">philip@FreeBSD.org</a>><br class="">CommitDate: 2026-04-23 15:26:56 +0000<br class=""><br class=""> Revert "Import tzdata 2026b"<br class=""><br class=""> This reverts commit 5417f0bbde91c148b3c3982eb2ab23a675b5e8d1.<br class=""></blockquote><br class="">Why?<br class=""></blockquote>Because Git ate the merge commit this was meant to be and turned it into<br class="">a mess. I did something stupid. I'll commit what I meant to commit<br class="">shortly. Just doing another build test to make sure I don't make a mess<br class="">twice. :)<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">To Cy's point, though, it is helpful to include some note along these lines</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">in revert commits that includes the "why" for the commit. In general when</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">doing a git revert <foo>, please amend the commit log to add a note for why</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">the change is being reverted as it isn't always obvious from the diff itself.</span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote><div><br class=""></div><div>I'm for that.</div><div><br class=""></div><div>I saw many times that a commit reverted without explaining "why". A reverted change is different from</div><div>a normal change. The latter is either simple enough or explains somewhat by the changed content, but</div><div>the former is / does not.</div><div><br class=""></div><blockquote type="cite" class=""><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">--<span class="Apple-converted-space"> </span></span><br style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 13px; font-style: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">John Baldwin</span></div></blockquote></div><br class=""><div class=""> <div>Best regards,</div><div>Zhenlei</div> </div> <br class=""></body></html>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EB8002C4-D106-433C-BA04-C8F4CDFFDE6D>