From nobody Fri Apr 24 11:55:03 2026 X-Original-To: dev-commits-src-all@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 4g2BGc63YRz6b7MQ; Fri, 24 Apr 2026 11:55:04 +0000 (UTC) (envelope-from des@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 4g2BGc5VSSz3nxl; Fri, 24 Apr 2026 11:55:04 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777031704; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EupeiTMfArMtxwRQs3Wby24IuNiXgBo9S68H1DF3CUc=; b=FQt+v/498xSMVRS3XZey4KPAQ0uDM2EmxDzX22K+flfzf9oo96+C6BdUWzDK+b1oReFQNM rEoluO4t+51SX7QfFniYiybe7MQZuORkdpkHWiFnAFxLrfsGDnpGACz8uTi0UwXaMm4By+ OYU1c/nr3l2KiqlBjQbZ8ukDWOayAhoXocjiPBvvKGSeiITdOHegC2UZnjzvkWdOMZoCh0 1ortZfvP6hdlIrajQA142xb79znFy8FVrN6CAHMKRosJjHjg9/IEby0+3XsMiTaXRNOWJZ 7+0bOdWHennYwBPftEC1O28zQUWelEUroORMCVURDiMfsZhTDun/o5Jo3rBJmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777031704; a=rsa-sha256; cv=none; b=Qhv6i26752kyvH/p2C4Tw8NPtmh9YWHyt9u9hs7cQsFRt718x483oh19Z6m4ZBSLXWpyZf 3plNzs8zKnGmbE/bBtYGXXGBY3N5ZbUB3XfizVorJPM4FAgQNBjvep3gPdeUl0Vhr6L/hB SafXzs1oZkKqa7cD7HiH2AFnBB86qSlhaB1xMPGoxSkejSrGr7IPqgBhl9xCtgmg9Aqcn0 cbGQPJtmKqJ70tLYV7Mvo4SusWiSid51EVHwzrE5RX3+CD0sr5fIWrWbNDiUT4xB22pVj+ /joEE1zHj6uOcLPJ8CADHwBWaMVWj6Y51cSQKdJIfVjYVycjz1i0NxJFnpj7/w== 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=1777031704; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EupeiTMfArMtxwRQs3Wby24IuNiXgBo9S68H1DF3CUc=; b=Y1gz115i3UpIwPwPEwIA4ZNCyGDYLABusWpQfZ3qscj9qzmHkG/n4I+bWzJOACoUliIPt5 Tfxw0c13LpkLDoZ4Dn+bmjDEEm+Lqp7kj/rMn2xUk0yxTeVsIjLrFOMXnfkNAFBjQulePC 4/Oji3sI0ST0LCokj2X9Zj+8JTr6dL1SqMnE+tE9TMyZJDrRGL80KQi3PK7ZoP+Qhz1NIu 4cNrvBkhXVUFSJ40kz4u2IpMM5Q70Eey/5s2Od9nwPQjx3/YQDKoUzOYKLzaYRYDGikP2u xkH6ZrnzCdMiJQUobpz3kovF0hHcJfWjCpYQBJOcf253p4YJ3/jIBbzwO5mGUQ== Received: from ltc.des.dev (2a01cb0585090500922e16fffef1acef.ipv6.abo.wanadoo.fr [IPv6:2a01:cb05:8509:500:922e:16ff:fef1:acef]) (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 did not present a certificate) (Authenticated sender: des/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4g2BGc3swCz8Rw; Fri, 24 Apr 2026 11:55:04 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 25BE87D473; Fri, 24 Apr 2026 13:55:03 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Cy Schubert Cc: 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" In-Reply-To: (Philip Paeps's message of "Thu, 23 Apr 2026 23:45:14 +0800") References: <69ea3ab7.36284.125e6d40@gitrepo.freebsd.org> <20260423154235.652AB283@slippy.cwsent.com> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Fri, 24 Apr 2026 13:55:03 +0200 Message-ID: <86v7dg4lpk.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Philip Paeps writes: > 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. :) Most likely, you had to rebase your working copy before pushing, and while rebasing merge commits is supported (with the --rebase-merges / -r option), rebasing _subtree merges_ does not appear to work. When `git rebase` replays the merge, it applies it to the root instead of the subtree, and since the files you are merging don't exist in the root, it goes hunting for similar files elsewhere on the theory that they've been renamed in the tree you are merging into. Unfortunately it finds contrib/tzcode before it finds contrib/tzdata, and proceeds to apply part of the merge in the wrong place. Apparently, with a new enough Git you can use the --strategy / -s option (`-r -s subtree` or `-r -s subtree=3Dcontrib/tzdata`) to handle subtree merges correctly when rebasing. I only just found out about it, so I don't know how well it works in practice. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org