From owner-dev-commits-src-main@freebsd.org Wed Dec 30 19:00:38 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 73FCD4CC27F for ; Wed, 30 Dec 2020 19:00:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) (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 4D5gbV2fMCz4XVY for ; Wed, 30 Dec 2020 19:00:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x729.google.com with SMTP id z11so14686711qkj.7 for ; Wed, 30 Dec 2020 11:00:38 -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=rD6IGB6B/SKOvgREeT1VQq97jVwycLLDKaNQ3mR0YSc=; b=DC8FpK/rS8IPM9Z69yQB94nCOB4qb9fNRX+rEjt3K9ph0NN9TVCKYN7duvPl9ql79Q c112Wf9eUpcx4IDy1rjm4QJa2ViA3CJxT7vwPa3lwReJbUe+blja3QoxmTNj6FlmeyYg xoi4TXd9+8pWqL5EPX+kL5eRunESISMcOYX+Z9ewVOS+r9YGKz3rieZe9W7oklbrdpBi HZCaIzV7kI+H3vJb90Dn40gOOny7YppmbFPsYKW+8NkJzPVD1lfqxT/C1cyojxUjjjZc 9ATG7s9lkTPcjoRN542Xmqxaozha9pWDZTRqPfuL7c6Lh5uFH6/nwTy/4kLxYL+5ftVh CS0g== 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=rD6IGB6B/SKOvgREeT1VQq97jVwycLLDKaNQ3mR0YSc=; b=NS5uniTb/7U9WrFmpsQkbJ51fDt9EqEcrf2uUILBaxGRHkeN7zfcPIrINZH5QilGxH 0FnAXaJVXvBiTSWJYkon9Isc6YzUwsDXPtdJOkyYguu6t1DbZBIRvsEINO89OTwL0pGT h29XtQP0fynBBzhs29JjGFJ929S8RBPsyXbOeVGWEqkFfKq1OKbeWtpC4bYv2ZFYvQvB RCkgXs19C3QVtmKdSuCRAmW9IN05M8fTtowy7rFrnpVY7IrxlYbonnJhTj1DWyNkBdwz 2VWThb2zyMGzbjHuIycYAlpei1ybZUT9n2VzFhR8MxZSO1GeE+tOz5m/fBTsTNLc/LSA 70FA== X-Gm-Message-State: AOAM531tAp1soAV8UKOg6yZmWM5dmY2nOMKCrX64Wx8+GI8TSgPtagN4 FSniSMZ5rOFyywBHDbj4Uk+FqfTmgV7gL1j3k4TWwQ== X-Google-Smtp-Source: ABdhPJzqS+GEMtDCOdNBo9nhqd/HV4Wsc8AKg3MxxtLXrDgBtvw81kAn3sIWPR4q7a4Idj+6YqZhi8KxKh0Ey3Y+ySM= X-Received: by 2002:a37:83c2:: with SMTP id f185mr24799724qkd.206.1609354837471; Wed, 30 Dec 2020 11:00:37 -0800 (PST) MIME-Version: 1.0 References: <202012301204.0BUC4qX7081946@gndrsh.dnsmgr.net> In-Reply-To: <202012301204.0BUC4qX7081946@gndrsh.dnsmgr.net> From: Warner Losh Date: Wed, 30 Dec 2020 12:00:26 -0700 Message-ID: Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL To: "Rodney W. Grimes" Cc: Glen Barber , Kyle Evans , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org X-Rspamd-Queue-Id: 4D5gbV2fMCz4XVY 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:00:38 -0000 On Wed, Dec 30, 2020 at 5:04 AM Rodney W. Grimes wrote: > > On Tue, Dec 29, 2020, 7:21 PM Glen Barber wrote: > > > > > On Tue, Dec 29, 2020 at 06:36:45PM -0600, Kyle Evans wrote: > > > > On Tue, Dec 29, 2020, 18:18 Rodney W. Grimes < > freebsd@gndrsh.dnsmgr.net> > > > > 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? > > > > > > > > > > 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? > > > > > > > > > > > > > > > > I don't see any particularly compelling reason to strip these tags, > > > > personally. I stripped them from caroot because we embedded them in > > > > generated files and it creates a lot of noise on updatecerts that I > do > > > not > > > > need/want, while providing no value to justify the noise for a purely > > > > generated file. > > > > > > They are not used/updated, so why keep a tag that does not expand to > any > > > useful information? > > > > > > > Deleting all the $FreeBSD$ in on go is massively unwise (or as the > British > > might say, "a very brave plan"). It will screw up MFCs on an epic scale > for > > years for no real benefit to pay for that extra developer time. It itself > > can't be MFCd. It's a terrible idea. We should not be deleting them, > except > > judiciously for things that cannot be MFCd. With the subversion exporter, > > they will live on in stable/12. > > Just exactly how would this screw up MFC's on an epic scale? Your > NOT going to merge this massive commit, which as long as you don't > touch lines near $FreeBSD$ things should just be fine. > By screwing them up. I'm sorry you don't have enough experience to know all the ways it causes pain: (1) merge conflicts often enough to require developer time to sort out (2) partial merges causing confusion when other changes need to make them. > Now commiting a change to $FreeBSD$ along with OTHER changes is > a sure fire way to cause a MFC conflict, but not anything major > that can not be dealt with via conflict resolution. > Right. We're inflicting conflict resolution pain over a large number of commits. This costs developer time, even if it's just a little. Removing $FreeBSD$ simply isn't worth that developer time. > Now what is being just shoved off as nothing is the fact without > $FreeBSD$ working the ability to backtrace cadence of a file is > going to be a royal pain in the ass, and basically means the project > has "lost" versioning of installed product. > You can commit the file you have to a temporary branch, and use a simple loop to find the file that's closest to it in the main branch with git tools. It's not that hard and covered in several stack trace posts. It's far more reliable than $FreeBSD$ since it will show the version that's the closest to the one you have, in case you moved other later changes in w/o updating $FreeBSD$. Warner