From owner-freebsd-git@freebsd.org Sun Dec 6 17:33:48 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 E55844A3F53 for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CptpN5Bzfz4b4Q for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id B0BF44A3F52; Sun, 6 Dec 2020 17:33:48 +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 B08664A3EEE for ; Sun, 6 Dec 2020 17:33:48 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CptpM6lmkz4Znt for ; Sun, 6 Dec 2020 17:33:47 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f54.google.com with SMTP id o11so7710293ote.4 for ; Sun, 06 Dec 2020 09:33:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=qb3CtE9X6S5LfFoK+lJaujIvlxCWSR2My/T0+UUP0Yc=; b=h3En36kPBDI+wn/xAldlcHqL9QRIHYvK1FG59a/7a5yPQJwDvW/WWYlPdoquuAUuXc 2UiPLHJPkuFki5hWeCk2Lg+aQw1dpLWcMJmrZypmrtyumq15bbBRWTKbq5N9jSBVTaY7 auCPEn4Q7I5tp/KijS1wIjGjZ+/CWjKgXGT+Q9zduS/d//ORk0B8ZVQXbAgoDetYCSiF bm+QuYXT+vXMJuwfT7lQ3gOXtdgc2ErGWypfjiJU7kk/kgsS2gNMUQhDmwFRDM5xWiQk b22CvXae/TL8ySNM3eA08wGEJqEst0O5ZMhVjCrgN65gWa2ojCPgqQAuKmSYasfC0oB4 8WpA== X-Gm-Message-State: AOAM533RL6A2aDSDDIsoB+Xnri8I8H3rOSYj061ZL3Oghi0ZXP8BB0dl yuUHhdfz9U5v8lpa3T7VkiEelXhMoVRJAgwwO6bfWneTO4k= X-Google-Smtp-Source: ABdhPJyIQ9nVEgaKwGjP7lsFdd6XMx4lHLnSKXvIsTDvkz8jgH0/hc3ieGFNwsJbj51k3D8PuOaARIQIcRwTA9/JOcQ= X-Received: by 2002:a05:6830:1f52:: with SMTP id u18mr10225047oth.71.1607276026112; Sun, 06 Dec 2020 09:33:46 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sun, 6 Dec 2020 18:33:34 +0100 Message-ID: Subject: Re: HEADS UP: src hashes will respin/change this Sunday To: git@freebsd.org X-Rspamd-Queue-Id: 4CptpM6lmkz4Znt X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.54:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_DN_NONE(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.54:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.210.54:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.54:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[git] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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 17:33:49 -0000 On Sun, Dec 6, 2020 at 9:51 AM Ulrich Sp=C3=B6rlein wrote= : > 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 > This has _now_ been pushed. Sorry for the inconvenience, the converter will not make that same mistake again, that's for sure :) Cheers Uli