From owner-freebsd-git@freebsd.org Sat Nov 28 16:51:15 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 90E834A56BE for ; Sat, 28 Nov 2020 16:51:15 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjyDz3n3Cz4XGR; Sat, 28 Nov 2020 16:51:15 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606582275; 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=guJrGxKYUkTMXZ4SgjjPss2X2r76LeyxEVd6wgypVeA=; b=jyT7me/5tfue6jlwKLl4o4k/eZtBoCsWpaObSdJy1kvFVd4mifhq/BeTkapJDAORx+QYNW YOcyDND+mZigfW1dLfb9ueP3RZaNIVY7pK1MTIr/kNf2QCXMH/xAWxvA0xHc4mUgLeQvHH l7Jd4MnvmJNEyHgTJAhK+qy4HOyk04UVQgSqTOKCjGwtZAAeX0/r82nxpOJkfWY5LHW8T/ dLteyrUEgs1SoW6q+XxGacnNMeROU51rFE2yi0eBPe2fbMH0/XcRT85wO9ywDfCbk/cuVt bSLhv78qyAb9aoUMMLcUIXVf8meO5Z/RsvWJJoDcXvfO7aS8SXu51bMLHtG6rA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 6F5E91BE6E; Sat, 28 Nov 2020 16:51:15 +0000 (UTC) Date: Sat, 28 Nov 2020 16:51:15 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128165115.GA22587@freefall.freebsd.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606582275; 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=guJrGxKYUkTMXZ4SgjjPss2X2r76LeyxEVd6wgypVeA=; b=lUuU2EIatFL/oasjAsndnxc7r9WtE1Ztnk4jDwit6s2LvgW4gswZonS/6dd6F2CB3X9Fij O7/jlFVIkaQmk5yHfNH3Zm5NAQd9oUNhuW6ZZv/rghlfmwd+xzjrCxMd+ek4r/yyCwWiHx W2zK5ydXUajuy10nWm1rwcZyOsaeIsq3vh4hYGT5aFAUKwXu2Hs26XSSLBj8kh1ODXw0VI wiEx6WV5UX1OyYRm6iGBZP7/Dpd2MNBt0AyL1gqN/5RIauVA/+DpvFX8W2CJvxxL6GATro uINsdl2AocVxKIfNAcxqbL2irpuG9H+h45lf2oCwCHASRCDi6w24/12gkWBytg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606582275; a=rsa-sha256; cv=none; b=hUAtOlBPMbkcpBVRQmBOME2wOgD6ysgUvWslK0Bx0ImEe+3AzCwT3JhbMgjYNl+8sR/wJI n1tv11BUB8JX3uawI8okQPBzfZN9EJKGkvwLBG619uxMdyCYo9KjHpec+vknB8eDjnSabN 76z1zDGfN0fRp8+Pem4O6Wm/KmoRHZUav9i5ovl5ztutPFN3zoQUccQUxyMsSxzlBol78Z v0HxaRHxlhpFr5fVo8Nw+v6Jy7I+hO2CjAPxnaUY9vpiMFLg9aJ6FWnUK2158brtTZ2PqC z8xtkXb4/7kZy4zhrCIGVFCE1o2SfPqaw+BRT3BYg92v8D81wOR4UjCPeRbgvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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: Sat, 28 Nov 2020 16:51:15 -0000 On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote: > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: > >Hi folks, bad news > > > >While carving out the history of the access and mentors file (we want to > >retain that for historical analysis, which people seem to do from time > >to time), I overlooked that fact that the previous runs for ports did > >contain all of CVSROOT, but the new one, by necessity would not contain > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix > >from the latest rules file. It should never have been there in the first > >place. :( > > > >All that is to say that this of course means all the git commit hashes > >for the ports tree have changed. Oops. > > > >Sorry about that, please let me know if you need help in transplanting > >your work from old hashes to new hashes. > The web finds [1] which would translate to git merge orgin main --allow-unrelated-histories but I'm not sure if this is the correct hammer? [1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68 René