From owner-freebsd-git@freebsd.org Sat Nov 28 20:55:28 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 6631C46AA02 for ; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 4Ck3fm2N9gz4knv; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606596928; 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=wm1PxJnwxlhUdZeGwZEBnwC5JTE2t3mdDDYEhQMEzRE=; b=d0Ks4al/4UUIXB4Gmsa8B92ZTjdRHDXGvcwE0PoHTsrg+eO5naj/uYgfdelrl6ejqyLy/j /zDuIj1BVClP4gm6wJaKMcvQVzFGW0dZDcb/OFAgUggVE2S02WF3HfSDpVGuztxAriMwmw Vr6a4/BgQK5w0f4aGn5c/v4WkzbjnA7xO4WqjjYgkNdTvA2zjQQk7kcWNCoLPA+bb+emN3 ITzSOCY4D8CgLrKuGrZewdpPc5whztamPSQ1VM1uCNInloNnPaOgJR9ZY8cDWsJcmAxFX8 OGQ8MnwBFYOZA2RcPKk8pT7cRSOyPFJJG0HQnjcI8OhdDfj4cxAQntqZJqv75w== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 428071DE96; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) Date: Sat, 28 Nov 2020 20:55:28 +0000 From: Rene Ladan To: Warner Losh Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128205528.GA58416@freefall.freebsd.org> References: <20201128165115.GA22587@freefall.freebsd.org> 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=1606596928; 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=wm1PxJnwxlhUdZeGwZEBnwC5JTE2t3mdDDYEhQMEzRE=; b=DMT51kjtE7g2I8qhK43a7bp60F+n1HupNPoZ5JGu0Tl7hUCk4D+fca9pIi8Fa0OA9GlDgr y4xSmv6k+JQVvU7N6GJGWe4LAvE26xFspVooM0wJ3gFE/Gp5ucWSRl39+Sz9hOfuCUxfKr wOLIGq4oJ/jKNydrcMs7CRyFkPZnVaASQ60vOYFXZ0+Wfx47QtHCHYmDZbS9jXApUzFbZA lKgnYUIDxo/HUn1nhd4g2QBCiQpsqgg6qLbn7Gyuv4BHsex1vOPMrM9KFlkoHR17Tclasc gvS4AmPDUSKf+de3P8YTPtQb2Rjsnc4etvT9TBkJ1WvAgOuyWzm1c6IMS4oZFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606596928; a=rsa-sha256; cv=none; b=uo7ZYOnq1MZ0pJOZfENeFoec/suqHDD1QsTrnawy5oBHTb08eX7edCzTqmNNfwK72mQm4I PViF19PiDY7nD1l0TZYDyByKklNWcvzvIVdhkfwlEGZLGu9Vgvbysu0Q9e2p7553XMkiKO CJnA7KGmQVCRH7L2gsixsgXDjjon9g5Zu2mTlxSuynchiFUTTTNQD6YalRu1a4/3G54dMi d1sSdWoa+iJaqix7T5n3gzEgay4ZINmQCWIqlYiRosbZwA/lEryacIURzlDdCIW8D4X6Yx 3pXZTTrxg5vNONeWxhvkgrMqzv/e77lh9s5NZ8hCfb6ZrS9scBSR60r2cXyt6Q== 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 20:55:28 -0000 On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > 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 > > > > I'm not sure either. What does your tree look like? Is it just tracking > upstream? Or do you have changes / branches? > I have a few local branches for some WIP things that I keep in sync with main. None of those are pushed obviously. If all else fails I can just reclone the repository and recreate those branches, they are of a temporary nature. René