From owner-freebsd-git@freebsd.org Sun Dec 6 08:51:21 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 98EA04767DC for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4CpgCY3lFBz3P0y for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7E88B476763; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7E4B447675F for ; Sun, 6 Dec 2020 08:51:21 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CpgCX5pPGz3P3M for ; Sun, 6 Dec 2020 08:51:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0B68pHkp055663 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 6 Dec 2020 09:51:18 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sun, 6 Dec 2020 09:51:17 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: HEADS UP: src hashes will respin/change this Sunday Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4CpgCX5pPGz3P3M X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2020 08:51:21 -0000 Folks, it's with a heavy heart that I have to announce that I will need to push new hashes to cgit-beta.FreeBSD.org/src today. SVN is the gift that keeps on giving and the converter missed 2 vendor merge commits in October. The history till early October will not change, but afterwards the upstream's `main` will diverge from what ya'll have checked out currently. To be clear, the _content_ of the commits stays the same, but additional metadata in the form of a 2nd parent will appear on 2 commits. For local work you should be able to just merge the new origin/main into your work (you may never push such a branch to the final repo though), or rebase/cherry-pick your work onto the new origin/main (you may push such a linear history to the official repos later). Please don't hesitate to reach out should you need help with that. Also note that this has NOT been pushed yet, I'm doing more testing and verification and there's a slight chance this might run into Monday. Sorry folks, Uli