From owner-freebsd-git@freebsd.org Sat Nov 28 20:41:16 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 0095446A1FB for ; Sat, 28 Nov 2020 20:41:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 4Ck3LM2Rq2z4jwY for ; Sat, 28 Nov 2020 20:41:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x736.google.com with SMTP id v143so7449529qkb.2 for ; Sat, 28 Nov 2020 12:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ye0mY7sBqYC0aQNRvKn+/rGISVubgQNCQFJ64L6+bf4=; b=PUOtmRTLbejjWj2xA46zzLE1sdti3Vssnw8dyNYpv9AjVvHUyQ4WV//GU5rOKKF9oo +LuOhe4P8jDHBYpuIgQsQWlP1qaT0NrBnRubIJvjY7IfuYo7LQ4cmtLGzzhuU0L56XOK ZE8dQI5JvG3tpmjGzkQip+t+7gSelkQiyTIJnyTzxarH9jBEDbQJFLLzIdHIBniAgLGD rkmjNitSJ4JWZwEPX+o7w3ytwWcC9azcVxIMy7aw4A7AVhXfwxFBWJ9TG6F2+OK7AzlO e/iNUJ8jnr2KqzKDg/93tvWr5SbmvkTHbcmD8w62VqJeZF1t4BJiFOVu+XUg8XG1BoRB 3TDQ== 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:cc; bh=ye0mY7sBqYC0aQNRvKn+/rGISVubgQNCQFJ64L6+bf4=; b=iq+e4Q5080AyhCeVzLTXoOFGfFe6L1FY1/GUYfB6kEug949010qees6Wm15Jwqo5TA dqSWU5HH6gCwNBQmvf4lJqBcQtTJCZKuvY5iSpkJDoJUe8FJoqXGAjQThoWRe2H4KOwI 4F3h4JCkOxt2FeA7hI59n+YDGfcWf4zSzalhap4q/8vhQaCR7gxLKd/f1sNxSjKUkvP5 5C55p/EJC6El1OUqQJw7lcuspNCLZD40OzJ/AEyngXNfkOVaxZjZOPLfBqW07IHDMaIS esvQzbqYL9xGumuz2OaWzKEd6n/kG52lQSbpf73H5E0+I5JlddSldVPRPYRMrS6BK+Yr D9EA== X-Gm-Message-State: AOAM531Ex3vPCZQLhqNy0meTGsxuOnQRsSGkpw394qP5OfvBEYSxznZ1 B8e9muVpD6TqA0IZFVepxsAbPRTMxtasaONFRyrlOQkkPqQh6A== X-Google-Smtp-Source: ABdhPJxwizTK8MoF0bTLgyrm4IASgKiA5e9W32nQ1WMjUFNy3ITucGPEKGo2SuuUcaDDghIwSrfsvuRtHeWkL9rsndE= X-Received: by 2002:a37:78c:: with SMTP id 134mr15541880qkh.359.1606596072995; Sat, 28 Nov 2020 12:41:12 -0800 (PST) MIME-Version: 1.0 References: <20201128165115.GA22587@freefall.freebsd.org> In-Reply-To: <20201128165115.GA22587@freefall.freebsd.org> From: Warner Losh Date: Sat, 28 Nov 2020 13:41:02 -0700 Message-ID: Subject: Re: HEADS UP: freebsd-ports hashes were all changed To: Rene Ladan Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Ck3LM2Rq2z4jwY X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=PUOtmRTL; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::736) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::736:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::736:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::736:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] 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: Sat, 28 Nov 2020 20:41:16 -0000 On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Sp=C3=B6rlein wrote: > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Sp=C3=B6rlein 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 contai= n > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix > > >from the latest rules file. It should never have been there in the fir= st > > >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#L= 58-L68 > I'm not sure either. What does your tree look like? Is it just tracking upstream? Or do you have changes / branches? Warner