From owner-dev-commits-src-main@freebsd.org Wed Dec 30 19:05:00 2020 Return-Path: Delivered-To: dev-commits-src-main@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 C4FD74CC5E7 for ; Wed, 30 Dec 2020 19:05:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) (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 4D5ghX4zZnz4Xsn for ; Wed, 30 Dec 2020 19:05:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x734.google.com with SMTP id z11so14698014qkj.7 for ; Wed, 30 Dec 2020 11:05:00 -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=avS+L8P5UvZekODKaLKZaFAmwDWDEo6h5UzYH+BjDO4=; b=oADEc1qDuyVXhgY5rQM0Us/v+Ne+vvF4U74Au0jBXj6cuZFVMgQqja2YD7bxIZdtWJ 0fRLAXHeTxBQwPGRqnNH3NTwRzpuuZx8vf6oItHah+tXipYgvBOrRyGO1vM0Wkj7MfUE QwMdeUpH0dTF3Ud42QHuVqgUc8H7Lm5rtyxRHZ9bGyw9SsjxD8u+TwCwVDxoePs54XTq QJWqKTfGII87J4pO59P1R3nTxWeva/lLJZFwj+rHDy9vPZOA32F19nmPQqcc7GlmHAmu RYNkBjfj/UO7jXWoP56wIkhlqg2J/qGg4tmzydVCXbvgX1IcgKthpv9NtVNlcL8QiXux chvA== 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=avS+L8P5UvZekODKaLKZaFAmwDWDEo6h5UzYH+BjDO4=; b=ZETNJZKN8nIJRpcj74LlfGQ7q+yVx98JNugRqRwvpQ78lqC3A7yIYnwhu0cId7sMIu yB/J+TAerLkHQ1LkAPOxWnXD+9nSxnq2QQa5svRMSy0PVvaIpxhq966il+pVE9it7GvX aUWfgbGeaYoE8fB19VgIl59ptKg1++ANTYB5RghA8vPdRABNG8CLLve834ShqF02Baso nOGy0MbLlqybDNQkTy2Sx7F/hpjUui+5xrgCYAuQ54/7wWh8kYgJXmiH69tTrSbGTOiV FItr5x5FnUuZp6hOXkHHhBiEKOTiWQQlIiL7dxq8I4JLjVHx750wi6QtFQ6YVXmXqL+n hXDQ== X-Gm-Message-State: AOAM533jAZWlsGqsJjPFYwhULTzvQ+11qqawq2jLQoZgyxgMjCm7c69I 7PqCS63bBdE1Q1x9CR07xYU0+bH98A+ts/k95ejK7Q== X-Google-Smtp-Source: ABdhPJyxXmlkI2F3NxY5HgGYXRckh/Zi3AuKW54aqGnKQoJ3EhwnzQFrnwwdMo11PLARkoZxBopLhmp982RT7WwET/g= X-Received: by 2002:a37:83c2:: with SMTP id f185mr24818547qkd.206.1609355100038; Wed, 30 Dec 2020 11:05:00 -0800 (PST) MIME-Version: 1.0 References: <20201230022048.GD1206@FreeBSD.org> <202012301212.0BUCCqUC081998@gndrsh.dnsmgr.net> In-Reply-To: <202012301212.0BUCCqUC081998@gndrsh.dnsmgr.net> From: Warner Losh Date: Wed, 30 Dec 2020 12:04:49 -0700 Message-ID: Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL To: "Rodney W. Grimes" Cc: Glen Barber , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org X-Rspamd-Queue-Id: 4D5ghX4zZnz4Xsn X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for the main branch of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2020 19:05:00 -0000 On Wed, Dec 30, 2020 at 5:13 AM Rodney W. Grimes wrote: > > On Tue, Dec 29, 2020 at 04:18:07PM -0800, Rodney W. Grimes wrote: > > > > The branch main has been updated by gjb: > > > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=70e64ba4494190e64ab8faa04d744182d420c275 > > > > > > > > commit 70e64ba4494190e64ab8faa04d744182d420c275 > > > > Author: Glen Barber > > > > AuthorDate: 2020-12-29 14:34:05 +0000 > > > > Commit: Glen Barber > > > > CommitDate: 2020-12-29 14:40:28 +0000 > > > > > > > > release.sh: Update GITROOT URL > > > > > > > > Hard-code the GITROOT for the ports tree to use cgit-beta > > > > until the ports repository is converted. > > > > > > > > While here, remove $FreeBSD$ RCS IDs. > > > > > > So how do I know what version of some file I am looking at > > > once it has been dis-associated from a git clone? > > > > > > > You can't. Git does not expand the tags. > > And no new mechanism in place to replace it? So, we have > no versioning of files in the final product any more? > No. We will not. > Sad, very very sad :-(. This may cause some down streams, > other than me, some very serious heart ache. > Git provides tools to reduce that heart ache. You can get the same info, but using different means using git's tools should you need to. > > > Is there some new mechanism that can give me the cadence of > > > say, /etc/pkg/FreeBSD.conf once its FreBSD ID is riped out? > > > > > > Also if $FreeBSD$ needs to be removed, can we please just do > > > it in one massive tree wide commit rather than have this > > > random piece wise needless noise in 1000's of commits? > > > > > > > Please, no. There is no benefit to prune these in one fell swoop as > > opposed to, for example, bumping Copyright dates. > > Well have to disagree on that. > > a) If it is removed in one fell swoop it can also probably > be undone in one fell swoop too. > It won't ever be undone, so this is irrelevant. > b) It concentrates the change in 1 commit that does NOT > ever need to be MFC'ed. > That causes merge conflicts for everybody for years. The cost here is too high. > c) It'll quickly get us to the damage that is done by > the loss of this information from the released binary > product so repairs may begin. > We can begin repairs w/o doing this. 99% of these never end up in binaries anyway. > d) It'll shorten 1000's of commit messages by the lines: > While here, remove $FreeBSD$ RCS IDs. > Who cares? I mean, this is not an issue at all. Like I've said: there's a real cost to doing this, and the benefits from doing this are quite small. As someone that's had to deal for years with partial merges of sweeping commits, please listen when I say that they always cause unintended pain due to their size. Warner