From owner-freebsd-git@freebsd.org Sun Mar 28 19:56:43 2021 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 A93255ACB91 for ; Sun, 28 Mar 2021 19:56:43 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4F7mgb4PVbz3JJn for ; Sun, 28 Mar 2021 19:56:43 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 971935ACC15; Sun, 28 Mar 2021 19:56:43 +0000 (UTC) Delivered-To: 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 96E6A5ACA15 for ; Sun, 28 Mar 2021 19:56:43 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7mgb15Gnz3JWN for ; Sun, 28 Mar 2021 19:56:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 12SJuYg9047642 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sun, 28 Mar 2021 21:56:34 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sun, 28 Mar 2021 21:56:33 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: git@freebsd.org Subject: Re: HEADS UP: ports hashes changing again on Sunday Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4F7mgb15Gnz3JWN X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] 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: Sun, 28 Mar 2021 19:56:43 -0000 On Tue, 2021-03-23 at 10:54:18 +0100, Ulrich Spörlein wrote: > >Hi again, >as we found another mismatch in the svnsync'ed metadata of the ports >repo, I will have to force-push the fixed metadata again. This will >happen sometime on Sunday and affects all commits after roughly December >2020 (which is where the bad SVN metadata is). > >Sorry again for the inconvenience ... we're almost there! >Uli This has been pushed and hourly updates will now resume. Till next week! Uli From owner-freebsd-git@freebsd.org Wed Mar 31 18:42:50 2021 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 F20965ABD61 for ; Wed, 31 Mar 2021 18:42:50 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9Ztx6mzLz4Tkr for ; Wed, 31 Mar 2021 18:42:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.66.148.124]) by shaw.ca with ESMTPA id RfnilCxaw2SWTRfnjljNXu; Wed, 31 Mar 2021 12:42:48 -0600 X-Authority-Analysis: v=2.4 cv=fdJod2cF c=1 sm=1 tr=0 ts=6064c2a8 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=dESyimp9J3IA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=jGy_ADHGWrA0iJEx7EIA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id E6C79522 for ; Wed, 31 Mar 2021 11:42:44 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 12VIgiJ3006095 for ; Wed, 31 Mar 2021 11:42:44 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202103311842.12VIgiJ3006095@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git Subject: Ports Repocopies Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 31 Mar 2021 11:42:44 -0700 X-CMAE-Envelope: MS4xfEzQtzSyt3jPK1fEEexh5+BfpeAZqTl9OYqhhZCFEvn+B7M+NTpchnlW76MG0kSCbyZEEjUQcTh2mMO55ooY1fpz8f3vNHVdtBgRhDcsJD1jrGuLS3Zq U0qRxTbdIatg+K17Fb0r0YU7LBixexHg1Ji1v1Ib2uQJavfw5Cf/Sv9Tn7pKJSuIUiu/MV8xLmYlYrXCmVxrNiadA3Ug1anAY+0= X-Rspamd-Queue-Id: 4F9Ztx6mzLz4Tkr X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.13) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [0.30 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.13:from]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[70.66.148.124:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.13:from]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.134.13:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.13:from]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-git] 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: Wed, 31 Mar 2021 18:42:51 -0000 Hi, Considering git's non-existent copy function, is it safe to say ports repopcopies are now a thing of the past? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Wed Mar 31 18:48:20 2021 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 EE9F55AC14B for ; Wed, 31 Mar 2021 18:48:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9b1J6SJ8z4V8f; Wed, 31 Mar 2021 18:48:20 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1617216500; 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=nF4/3vzWMkjCRdrIN49fZGSUgKVSCZvq6wEONb9GdYY=; b=chHTe6XXw6+DuPQcF90mTadgU0KJnjWJ9nXChVlnRMxRS1ue7DVdrqVqr4RcwInTfz8bXw h4dV3KLa2DccKXHEp40mnvssFW19TUJ4HWOkJzJHKrpyMHD8G2lsyw0+CI6b5qlJVCr7Ks FRJD9SRHuWLolkbARwd/QJIO4Mw3rKXOyno8MNxOw3d2MdjoL1DR9sWXbeoy0OH59e2cH8 l61Y/6wmrwxoBJj2grbVTjxDyEyO8HJdDGh+/0K1XAn9nmrkTisOYsLpXTaM0a3FCprtvH Pt9HaP8P7a0cQlvyMAEEMh8FJ0i0RziUnYDa4lGaMwqMFNDGWXb6wjo77wUwFg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id C9BB0312E; Wed, 31 Mar 2021 18:48:20 +0000 (UTC) Date: Wed, 31 Mar 2021 18:48:20 +0000 From: Rene Ladan To: Cy Schubert Cc: freebsd-git Subject: Re: Ports Repocopies Message-ID: <20210331184820.GA26869@freefall.freebsd.org> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202103311842.12VIgiJ3006095@slippy.cwsent.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1617216500; 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=nF4/3vzWMkjCRdrIN49fZGSUgKVSCZvq6wEONb9GdYY=; b=UQRXil1K1+8BpD6d/oCE9oSpMf4XqT/XdMnatUzWT0wLgeXpnFf/+ArY3lfmD8CDh+PVNS lnC1B66kbFoVqdRJqB03JWcrUzNNFKG/b2R/33InaFyQZhi+yz4vAeASDBHQwyOveSwI3E rWH742ODMJJyvo7e7VMlDjn96ChGWvMKm/IX/YO0+CWMMlbOQFOw6tEfdDvR89EoV3oi2k pSMqdfkJqsYOB9HVjMOUJ6nQxk1KciBowBJHTx26EfgrJFAG9+eINX65MuxR6BgF899Few PeoPKmCv2rmeHdanwloH4RHl050+Doen6Ogaui9jSgeYk1E4b+gW11b/Ast9wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1617216500; a=rsa-sha256; cv=none; b=iV/86aT2USpNy2muINPvKunXTLGtfJTGMXcSgwpm+e1ZVC+5Hf+RklsVmqT0lQRbXhvb5Z xT9P1MIoPRr1ELkXNd1E6iGT6GKuuir6DaNXjY0mBQDzvrUgRLS0k1rhxwycRLgRTeF1aD H6k2jCqU6Eg+O24gBdiJQgtmFXYpUW2lCi7gWKZIOnAv6yAbeFk7FRZfaj/3vBLzI3JNIH 0dC0I5XGxlMO8AzgY24qDjWxYcPpeCqhwYtQCKF+Wh5kOHmixJbbAEFwLs9roLOk9aNSS1 1KCN2AirnX7W0p/Fy3f0KJ8u+3nJ3MSiBHeqsgTYGS6S/vpOhXF/J/JCO3dm0Q== 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: Wed, 31 Mar 2021 18:48:21 -0000 On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: > Hi, > > Considering git's non-existent copy function, is it safe to say ports > repopcopies are now a thing of the past? > Yes, there is no (proper) way to simulate this in git. René From owner-freebsd-git@freebsd.org Wed Mar 31 18:59:52 2021 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 C214B5AC91D for ; Wed, 31 Mar 2021 18:59:52 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9bGb5ZvPz4V8F; Wed, 31 Mar 2021 18:59:51 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.66.148.124]) by shaw.ca with ESMTPA id Rg4Clz45inRGtRg4DlZr1K; Wed, 31 Mar 2021 12:59:50 -0600 X-Authority-Analysis: v=2.4 cv=cagXElPM c=1 sm=1 tr=0 ts=6064c6a6 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=xqWC_Br6kY4A:10 a=8nJEP1OIZ-IA:10 a=dESyimp9J3IA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=l1PXcGdkn6i0LcicGBgA:9 a=wPNLvfGTeEIA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 8FF2954E; Wed, 31 Mar 2021 11:59:47 -0700 (PDT) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 12VIxlcn006294; Wed, 31 Mar 2021 11:59:47 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202103311859.12VIxlcn006294@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Rene Ladan cc: Cy Schubert , freebsd-git Subject: Re: Ports Repocopies In-reply-to: <20210331184820.GA26869@freefall.freebsd.org> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210331184820.GA26869@freefall.freebsd.org> Comments: In-reply-to Rene Ladan message dated "Wed, 31 Mar 2021 18:48:20 -0000." Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Date: Wed, 31 Mar 2021 11:59:47 -0700 X-CMAE-Envelope: MS4xfD4xKb9tc3bAkAeojGlHksddV8rcWaSZJXQu48AtslnoqLXH9cR++dNMUYpmJSXOPFKzk7ev9+h6pZyY1CwADmdbudMpyj+p+TV/07JpolMcKyNrD+Cl 8TJM2QYJBavOZIAjboB1sjVU+wkWmhTs7lBclEtYppoqDWII22sVFg0TSwAXUVC24+kpR+Vy42trDPNkiykPwRfeUl8omUsPtDTljVYHdZVnPG7TU33G6GvJ X-Rspamd-Queue-Id: 4F9bGb5ZvPz4V8F X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.136.138) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-1.67 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.136.138:from]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.974]; RECEIVED_SPAMHAUS_PBL(0.00)[70.66.148.124:received]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.136.138:from]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[64.59.136.138:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.136.138:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MAILMAN_DEST(0.00)[freebsd-git] 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: Wed, 31 Mar 2021 18:59:52 -0000 In message <20210331184820.GA26869@freefall.freebsd.org>, Rene Ladan writes: > On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: > > Hi, > > > > Considering git's non-existent copy function, is it safe to say ports > > repopcopies are now a thing of the past? > > > Yes, there is no (proper) way to simulate this in git. Thanks. I have some work on the back burner which I've never gotten around to commit. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Wed Mar 31 21:54:53 2021 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 9CAAF5B24A0 for ; Wed, 31 Mar 2021 21:54:53 +0000 (UTC) (envelope-from dan@langille.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9g8X6Z4Cz4j23 for ; Wed, 31 Mar 2021 21:54:52 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 8A1421CD1 for ; Wed, 31 Mar 2021 17:54:50 -0400 (EDT) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Wed, 31 Mar 2021 17:54:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to :subject:content-type; s=fm3; bh=TCkVSEdJcaJc6WEHWnPuHPz0Q/yMG7m 1KtS3W5Yterc=; b=b1q3V0P2ZQ/BPC6BT0GYOtbL1+MrQ1Je/uv0e5Vr01j9oWO gfB9lLOuK+KFAgsPKZq0hE/RWez6TF2/erSVe5yfldvGw6NaihSsIGGzvlrZ/02o P5IyaOfqYI53muYVNXlkcZJesIJyMv+xZN0BHlO0o8u75OMzq+mwz02L8cMFieb2 jKNZ6XMBCnIOTaM/dN1F7sUMrTTmQ6Pr2ouf9URNQl1AB/AyRCr4jQzOdQngmeG8 BfI/zRczHr8+DWV6HCf1aqkK1NQSyNFNQWUvMAVNCvu9LtPNWmtoEXr5kda08HQu xYA5J0yGnoy3FpCZ1zZSKGHtJT10fVpO3ciw6tA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=TCkVSE dJcaJc6WEHWnPuHPz0Q/yMG7m1KtS3W5Yterc=; b=eR/pFDQUNHneTKRu50CtDQ allVi122H1zGaG9Bj38/92956g929Y2wKdBH5cyj2YPF/ZeckYBSIjZl4mrkR7ce IDCiOquw0C+BPflI/WjK+YdVT3wUYHqCXvE8zqT5Xc6Zq29DmXo7L2MmfX9ccwi/ LdrS9YkzrLo9qMrFagDcXaNveZ2B2Q7/PoMq0TSh97vpyYspIkW23cCHYEcJQVdk 8/wl3+gpffsaMmHASzPrtOSlbI4R3v0ZmvnhPoOzEKhLYnRwd4RiRJvdQzbvQjUn 1al2b0lINhA5UvZ07D8gzOSNgmEFZQB7454e4hEv0bAHWYQElHBj7GrBMBne2wzQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudeifedgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepofgfggfkjghffffhvffutgesthdtredtreertdenucfhrhhomhepfdffrghn ucfnrghnghhilhhlvgdfuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucggtffrrg htthgvrhhnpeeljefggeeuheeuieevledvjeevgfduteeukefggfffieevhedugfffveeh jeevffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe gurghnsehlrghnghhilhhlvgdrohhrgh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id C333710E0081; Wed, 31 Mar 2021 17:54:49 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.5.0-alpha0-273-g8500d2492d-fm-20210323.002-g8500d249 Mime-Version: 1.0 Message-Id: <6cf11fc8-d75e-451d-ada2-03a9f06048b4@www.fastmail.com> In-Reply-To: <202103311859.12VIxlcn006294@slippy.cwsent.com> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210331184820.GA26869@freefall.freebsd.org> <202103311859.12VIxlcn006294@slippy.cwsent.com> Date: Wed, 31 Mar 2021 17:54:28 -0400 From: "Dan Langille" To: "John Mehr via freebsd-git" Subject: Re: Ports Repocopies Content-Type: text/plain X-Rspamd-Queue-Id: 4F9g8X6Z4Cz4j23 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm3 header.b=b1q3V0P2; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=eR/pFDQU; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 64.147.123.21 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.09 / 15.00]; XM_UA_NO_VERSION(0.01)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.21]; MV_CASE(0.50)[]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.21:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm3,messagingengine.com:s=fm2]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; RWL_MAILSPIKE_VERYGOOD(0.00)[64.147.123.21:from]; MAILMAN_DEST(0.00)[freebsd-git]; MID_RHS_WWW(0.50)[] 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: Wed, 31 Mar 2021 21:54:53 -0000 On Wed, Mar 31, 2021, at 2:59 PM, Cy Schubert wrote: > In message <20210331184820.GA26869@freefall.freebsd.org>, Rene Ladan writes: > > On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: > > > Hi, > > > > > > Considering git's non-existent copy function, is it safe to say ports > > > repopcopies are now a thing of the past? > > > > > Yes, there is no (proper) way to simulate this in git. > > Thanks. I have some work on the back burner which I've never gotten around > to commit. I have read a discussion of repo-copy, perhaps on the git mailing list. -- Dan Langille dan@langille.org From owner-freebsd-git@freebsd.org Thu Apr 1 07:58:44 2021 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 921C75C2800 for ; Thu, 1 Apr 2021 07:58:44 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9wYJ3lr0z4s1g; Thu, 1 Apr 2021 07:58:44 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 58DA421463; Thu, 1 Apr 2021 07:58:44 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:0:ad4f:7800:ed96:1fa6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 34562942D80; Thu, 1 Apr 2021 07:58:43 +0000 (UTC) Date: Thu, 1 Apr 2021 09:58:41 +0200 From: Mathieu Arnold To: Cy Schubert Cc: freebsd-git Subject: Re: Ports Repocopies Message-ID: <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="wo6scxfoznbg6qtj" Content-Disposition: inline In-Reply-To: <202103311842.12VIgiJ3006095@slippy.cwsent.com> 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: Thu, 01 Apr 2021 07:58:44 -0000 --wo6scxfoznbg6qtj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: > Hi, >=20 > Considering git's non-existent copy function, is it safe to say ports=20 > repopcopies are now a thing of the past? Note that we stopped doing repocopies when we switched to subversion in 2012. If you are talking about doing a svn copy/move to record the ancestry of a new file, you don't any more, git does not record file moves or copies. If you are talking about the resurrection of a port, it would be possible to achieve the conservation of history by creating a branch before the port was removed, updating the port, and merging it back into the main branch using a merge strategy keeping the files on the branch being merged. But it would probably make reading the logs very ugly, and add merges everywhere, which we don't want anyway. --=20 Mathieu Arnold --wo6scxfoznbg6qtj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmBlfS1fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgKPng/+IshoXPZGqx2gLcWiLwJtYkOm9lnL16yD3sjPXUEctlI68dTCK0yHxkB5 J7zswtcp/untZET/geOEgusFozzBC6LSoPJsYSMMxYeP1H6jDooq7DKdU86WRM4o UWpl0rNnM9IsFm5OiXHI6KFDb7F1Nn7yqpj3Qqt7y+Pe1vjp2DZw6TIvt6Tdk54z 7ilVtxNqPfo11uLrtODuR/dobQa8zcG5NPNVaSSJMrQontFbHwExXZZjStVE26W2 mN0nndSliCNX38nJZS/r9NUgp13zrC7TiEjNNIv/lmLxiKxnPIVXY04THQX/WZux vXFFzI2v7jLl6/0LmaxrUK1NsJ6FDeqwHtpuMhYDk6dFX3y4DUkktbm2uSb/Bn8S UNCg1tYtQgAxLYN8gnhqkaTQpg0AqyHAB27vCeWtzR6Le5ELPrwS/Q1X2D2FF3fp MmAW/h/n+SGR6yQ1VZRp1EQu49/7bZpN8wS4zi8zS/ggDoBxv40VQt3Kj7T/Pldc yNnx0BKfr1+SdgjegKS983m7D9iG7HUmzAFgHG07jfpHZV30CO985ARTqy3FGEpH r/a595W6TThK8LsOjP0KGyDXoyden1a6B4+XgRu80rBMVTY5oCdvTlwxOmmawW34 7hWPMlvbayg157UX8Jw4ZmomB7ir/Sxc/ywG0L3w+jbKtAmEqmA= =HeD9 -----END PGP SIGNATURE----- --wo6scxfoznbg6qtj-- From owner-freebsd-git@freebsd.org Thu Apr 1 08:38:07 2021 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 E6AD95C4518 for ; Thu, 1 Apr 2021 08:38:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-19.consmr.mail.gq1.yahoo.com (sonic305-19.consmr.mail.gq1.yahoo.com [98.137.64.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9xQl4HV3z3Byn for ; Thu, 1 Apr 2021 08:38:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1617266285; bh=2zNk+7NnDHYtoaq7jcMKNt+zQXpW3GbHVUKUfdY/c8+=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=M9d0Ok7kP26BreB1DQunxNT66fBXzpssP1W3IgoJtG9XX5g4FBiMyHmW2xPmOTC7CK7RwLJn3sWsF/gWn80qC6zWKMZcle3lF0jnzMbHgJtmr40i/IW1XaEfqaDEShRT3zxGlbHAuNiJHLgdHbPTVR0ZrTxcSdZrl2Ji0Dp2Q5lZcGKm92GhyN+oLrP6B660fO6TJAiAt+SRglW7aunI720G09VhvdOcOakzdpQPQZDNRpkbsf+xoDvLFg8Z7LjNE6QSnrqMJFaZv+RfV7pMyQE8aAyl/kjsaQOMQccoQ571ESVgH9cDUGY4+F8KdC7EdJ7Jvyq/dwJlYYpJbSs9cw== X-YMail-OSG: kojFVboVM1nWVXoWMAfRmbYYFem9AJ6dPHC52j.Neuc0pcna5xqv0UQ3C3IV.VC 3JsNHzq_Y8JfQItIBZ0k5f1pe2rlgEDGYhiX_XzoW5.8OjUKMXn.JPGBP1mX68.Hvz_57NVx1k3e 50cZQte2ge24GdfZjVt6JY3HcAGq3CRoZWJyeZDDHx9TAhechuN_iRc5rmcPiXF3D8tsCRqGK_jl awAfWnjbLP0KWWEOr_Vh8r7UeVujhAjlgd2uXyvVmk3U6TB4tS5Rk9wb3vbw77TsdMCyeOzRai4o 8ZOvMRkpxIahbf4d8H0kT3C4GVNB1b4T5j5mzg7WT.lmmXa2hEYedwn3QRAs4XA1yHnrLfD2KjSP eTMqKulkGPbB6joGEqfcCNo5JXk8PzlKx85IIRO7niAMwfjmVC9olvTD6rVprxkGn7EC4PDO1Rje 74rb1HvI1MXXDtOXVxfyvvMve0IKYLan58FeT_02qCUkWca0MKoZG1RMAskDKhOw7TmmwsEiaL6v V.WwoKss0.83h_TrTwNTRyHmw0oarTW7RaYbf3H1XSKxXxmVJr0olcEbDpnP2dwf45Gz4hXSPGFq g9FmzMHWNv.KButAeP.cZ6TqRZQKvZfnrPvhv5K1g_s9ebS5Jn7p4Fdd3gJ.tsDAjFyDLEZcePk9 mzgvN7sDBcJiy3_m_0IhBqTrWidG08TzjG2llOqKelVjCky2IlWK6swgUnqQOVuYFed7JhulAhAp aBl0SAEs78xx3LUjZX3GuqUab86XuJwrAX3Ozip7ettUxN3DJQ2aRpl8oMzgonjDWhadtOxxXBQP iCVVXaSVw8V7iUUSFXCNA6jcm3gpRRIhv3.sRTKxKziD33PcMt1kEIYjvGCQNXp6U6myBtdKVQVw giZnOEHeB6HXaxojLHm_.yWjvlZFsPyz8dj6QAF_707Ybjypct4EHAjbR.nnNqUquGD4P4lF8LYN apIn9TYSFJzrLiC3Ih8FWHKxuzomM4hK.6CyP94mUEUtIb2Y2W4EmHIhl2d0CWeK_2Ecad4t9ewX MG7Cfda0mQzbUBHj2GJC_zioydRTR7ciTxWKULTd_wZQJxLCyGSvP7E6C0k3YGY1bQbnprR4OoIf ojJKPhQY.kvXW6itVaUvdNxOp8DsghfGguKU_Jrq_wazcsMSAdnh_plnpkXNxD4biZW_K55e1iGr XP1y7hPjjkGt7MAyWlaioARSPdaIsRE.dUihOQgnmrdRxVCsk5TO35iTawZknYdpeBfiAQoArv3p hqOb6r67564KF.nHTHRnK7bUGroHPh2QeFkJ4xGYAP9cu3xhgVDnbBVkcJGFkHCV7s0y5y4N8unf mVksIxzjlVHEZ1aJABS4AqKn2QJE0hZihVm_sIDPuIMSH0URF5HRLdmfU4yMvlzzK8rN.9Jl23qY zI3df62unut4mW2D1oOq2fOcVg3Oummfzb3bOjnTGtAzG6bpda6r4J.1qMV4zh3JHcmEgCa5qpZZ jLsPQkEI2UFyIBCqqu9ejQ1ozC4DDyhPqOHhQgacO9Meq2VImqjwb2SJrqkx.a2TImNuNV4qQgg0 Ta9CEYhFr9XYjou05zz7FuqlWDk_4e.MnBJdXuZa4HcqzOVlnVzNLAKHKO01EMB7xWA5ALonmjdZ I7qzdL6vHrQhD0K0tlS9Sk_2Hslj.0LhCkNQiNNhpmJFPpPuu9nmfrX2CuH1J4bE7b3HMjknHjoL qHIlncGVpOA8ezx1yX5jUW3s6BY5ykfEtbmqdUISd7bcafc3065UDd8uaGOx3xQInEqcAb0JzTWy C2nsDxctMjWDnre1Qkh5.xfwOLueu.wq2s0tRoh0hcm3UqaQ2Sd.gHsLwtRMtiYhkk._fZdINH74 za7TyJUscNGkJRWwRvDuFbRo3aii7vPKzCVRR8cbXYEtUwbUWZOC8Kws8ZmhcKGWczrfYAdmK1Wm SJB98Ksnl3c2EsCZtGdWrjrDLqkpHkNsuCZeQEnYfhTgiYmSg4QCp6KndSSWeDnxrqT3SxBsjVT_ hps1exGt7q4ihucJ0rO6xNpfFvQmql4.mCgjKLcV.0okJPgl1jM_rgfmrjwHfIYODPWkmVJUKzL_ wpFLWgesck_gP_XDcc017cg7y9L6l8K8LNtCHta7P0KyGQMfJ33eipENndI2XZP26QwWiqBgxJ74 epWHS0fSnKWWkrxz3jlmPcmHGMSUbRkBdxxs7K38Lstrc2G.EK3uTr8zY4qqx3JynZJvabpkOmPs fPhGAU9CCfrO4K9AqGn3gL773udzfDjgJiGOZrvro4OV04EdpPvHdpnMcyxJbhduJYACUxqva79V lDEtgpvdQ6IgyxR9wnAbKvn13hajj1HG7rvEgE9I5bgsCNafR.7_wri2o86HB6n86EAKns3fWZN3 eUXB.Q4uAilLXiyPBPHDbOWVfXHky3IjgP8Si_UhgTulw1c72vAa0Y_vTCUXaSNRW6G3VdvwEJan yoZRnC6sVwSBecI7DCKWhA733et7C93ei.M6nn3yd_MlwqS_6Nbu_Q46WAqVE5lwWbph.24Ro3E0 IHGQmaYeJEx2pTP1wg6wWsyk_mRMszlO7ovUgX.F_xNJQmPlN2WKYB7c8XzgJ81yEkfuxbyMiEKR lYy81UsdOBARMx5GgyUK0S1NXZKjLbANm5ONpkui9tprrb_KstwW2VeCrfe5W X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Thu, 1 Apr 2021 08:38:05 +0000 Received: by kubenode548.mail-prod1.omega.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID e802fedec68ec9b16ee6df3ad278b60a; Thu, 01 Apr 2021 08:38:00 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: Ports Repocopies From: Mark Millard In-Reply-To: <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> Date: Thu, 1 Apr 2021 01:37:57 -0700 Cc: Cy Schubert , freebsd-git Content-Transfer-Encoding: quoted-printable Message-Id: <583A7D01-9CAB-4C42-962A-BBDDBDED494E@yahoo.com> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> To: Mathieu Arnold X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4F9xQl4HV3z3Byn X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Thu, 01 Apr 2021 08:38:08 -0000 On 2021-Apr-1, at 00:58, Mathieu Arnold wrote: > On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: >> Hi, >>=20 >> Considering git's non-existent copy function, is it safe to say ports=20= >> repopcopies are now a thing of the past? >=20 > Note that we stopped doing repocopies when we switched to subversion = in > 2012. Terminology mismatch vs. committers-guide? https://docs.freebsd.org/en/articles/committers-guide/ has use of "repo copy" terminology: QUOTE 22.4. Repository Copies 22.4.1. When do we need a repository copy? When you want to add a port that is related to any port that is already = in the tree in a separate directory, you have to do a repository copy. = Here related means it is a different version or a slightly modified = version. Examples are print/ghostscript* (different versions) and = x11-wm/windowmaker* (English-only and internationalized version). Another example is when a port is moved from one subdirectory to = another, or when the name of a directory must be changed because the = authors renamed their software even though it is a descendant of a port = already in a tree. 22.4.2. What do I need to do? With Subversion, a repo copy can be done by any committer: =E2=80=A2 Doing a repo copy: =E2=80=A2 Verify that the target directory does not exist. =E2=80=A2 Use svn up to make certain the original files, = directories, and checkout information is current. =E2=80=A2 Use svn move or svn copy to do the repo copy. =E2=80=A2 Upgrade the copied port to the new version. Remember = to add or change the PKGNAMEPREFIX or PKGNAMESUFFIX so there are no = duplicate ports with the same name. In some rare cases it may be = necessary to change the PORTNAME instead of adding PKGNAMEPREFIX or = PKGNAMESUFFIX, but this is only done when it is really needed =E2=80=94 = for example, using an existing port as the base for a very similar = program with a different name, or upgrading a port to a new upstream = version which actually changes the distribution name, like the = transition from textproc/libxml to textproc/libxml2. In most cases, = adding or changing PKGNAMEPREFIX or PKGNAMESUFFIX suffices. =E2=80=A2 Add the new subdirectory to the SUBDIR listing in the = parent directory Makefile. You can run make checksubdirs in the parent = directory to check this. =E2=80=A2 If the port changed categories, modify the CATEGORIES = line of the port=E2=80=99s Makefile accordingly =E2=80=A2 Add an entry to ports/MOVED, if you remove the = original port. =E2=80=A2 Commit all changes on one commit. =E2=80=A2 When removing a port: =E2=80=A2 Perform a thorough check of the ports collection for = any dependencies on the old port location/name, and update them. Running = grep on INDEX is not enough because some ports have dependencies enabled = by compile-time options. A full grep -r of the ports collection is = recommended. =E2=80=A2 Remove the old port and the old SUBDIR entry. =E2=80=A2 Add an entry to ports/MOVED. =E2=80=A2 After repo moves (=E2=80=9Crename=E2=80=9D operations = where a port is copied and the old location is removed): =E2=80=A2 Follow the same steps that are outlined in the = previous two entries, to activate the new location of the port and = remove the old one. END QUOTE > If you are talking about doing a svn copy/move to record the ancestry = of > a new file, you don't any more, git does not record file moves or > copies. >=20 > If you are talking about the resurrection of a port, it would be > possible to achieve the conservation of history by creating a branch > before the port was removed, updating the port, and merging it back = into > the main branch using a merge strategy keeping the files on the branch > being merged. But it would probably make reading the logs very ugly, = and > add merges everywhere, which we don't want anyway. >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Thu Apr 1 10:39:50 2021 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 7ACEE5C7775 for ; Thu, 1 Apr 2021 10:39:50 +0000 (UTC) (envelope-from liedtke@punkt.de) Received: from mail.punkt.de (mail.punkt.de [IPv6:2a00:b580:8000:11:1c6b:7032:35e9:5616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FB07947nwz3Lb7 for ; Thu, 1 Apr 2021 10:39:48 +0000 (UTC) (envelope-from liedtke@punkt.de) Received: from [217.29.46.84] (kagate.punkt.de [217.29.33.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.punkt.de (Postfix) with ESMTPSA id 53BF038806 for ; Thu, 1 Apr 2021 12:39:46 +0200 (CEST) Subject: Re: Ports Repocopies To: freebsd-git@freebsd.org References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> From: Lars Liedtke Organization: punkt.de GmbH Message-ID: <09169422-5c59-74a9-82ad-5d6d5fd17d7a@punkt.de> Date: Thu, 1 Apr 2021 12:39:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Content-Language: de-DE X-Rspamd-Queue-Id: 4FB07947nwz3Lb7 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of liedtke@punkt.de designates 2a00:b580:8000:11:1c6b:7032:35e9:5616 as permitted sender) smtp.mailfrom=liedtke@punkt.de X-Spamd-Result: default: False [-3.12 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:b580:8000:11:1c6b:7032:35e9:5616:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:b580::/32]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; HAS_ORG_HEADER(0.00)[]; SPAMHAUS_ZRD(0.00)[2a00:b580:8000:11:1c6b:7032:35e9:5616:from:127.0.2.255]; ARC_NA(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.82)[-0.821]; DMARC_NA(0.00)[punkt.de]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:16188, ipnet:2a00:b580::/32, country:DE]; MAILMAN_DEST(0.00)[freebsd-git] 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: Thu, 01 Apr 2021 10:39:50 -0000 >  If you are talking about doing a svn copy/move to record the ancestry of I believe this is not true. Maybe git does it differently than svn, I don't know that; but git does record moves and copies, whilst copies are like new files for  and moves are deletion and addition, git as far as I know. This this might not be explicit but implicit. -- --- punkt.de GmbH Lars Liedtke .infrastructure Kaiserallee 13a 76133 Karlsruhe Tel. +49 721 9109 500 https://infrastructure.punkt.de info@punkt.de AG Mannheim 108285 Geschäftsführer: Jürgen Egeling, Daniel Lienert, Fabian Stein From owner-freebsd-git@freebsd.org Thu Apr 1 05:11:48 2021 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 A0FEF5B21D0 for ; Thu, 1 Apr 2021 05:11:48 +0000 (UTC) (envelope-from idefix@fechner.net) Received: from anny.lostinspace.de (anny.lostinspace.de [IPv6:2001:608:a02::33]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9rrg35Hfz3p1G for ; Thu, 1 Apr 2021 05:11:47 +0000 (UTC) (envelope-from idefix@fechner.net) Received: from server.idefix.lan (170-058-210-188.ip-addr.inexio.net [188.210.58.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: idefix@fechner.net) by anny.lostinspace.de (Postfix) with ESMTPSA id 57D8050623 for ; Thu, 1 Apr 2021 07:11:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fechner.net; s=default; t=1617253904; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KWuL8HJcYsP826DZEvBPu+VpfTVoBitfMrrff2eTwuk=; b=Xebk1Qo5XjLOICjz6zB6WfykT/w63ffWH/cwrrB3cQdj4MzsJGiu1rnvt+OlQT31cp0BRX ivclIjvyALhITOZKiDLpRopYcdgoL6avs84cGp/BRaJwelGgHBqVGwe2Deiq95guUO/M1S qIrxHo7lRwnpS+abdQZ0IyNgY52KqbU= Received: from [192.168.0.151] (170-058-210-188.ip-addr.inexio.net [188.210.58.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by server.idefix.lan (Postfix) with ESMTPSA id C4B3B3EA55F for ; Thu, 1 Apr 2021 07:11:43 +0200 (CEST) Subject: Re: Ports Repocopies To: freebsd-git@freebsd.org References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210331184820.GA26869@freefall.freebsd.org> <202103311859.12VIxlcn006294@slippy.cwsent.com> <6cf11fc8-d75e-451d-ada2-03a9f06048b4@www.fastmail.com> From: Matthias Fechner Message-ID: Date: Thu, 1 Apr 2021 07:11:42 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <6cf11fc8-d75e-451d-ada2-03a9f06048b4@www.fastmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Server: anny.lostinspace.de X-Rspamd-Queue-Id: 4F9rrg35Hfz3p1G X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=fechner.net header.s=default header.b=Xebk1Qo5; dmarc=pass (policy=none) header.from=fechner.net; spf=pass (mx1.freebsd.org: domain of idefix@fechner.net designates 2001:608:a02::33 as permitted sender) smtp.mailfrom=idefix@fechner.net X-Spamd-Result: default: False [-6.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+a]; TO_DN_NONE(0.00)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_COUNT_THREE(0.00)[3]; RCVD_IN_DNSWL_MED(-0.20)[2001:608:a02::33:from]; DKIM_TRACE(0.00)[fechner.net:+]; DMARC_POLICY_ALLOW(-0.50)[fechner.net,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2001:608:a02::33:from]; ASN(0.00)[asn:5539, ipnet:2001:608::/32, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RECEIVED_SPAMHAUS_PBL(0.00)[188.210.58.170:received]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[fechner.net:s=default]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[fechner.net:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2001:608:a02::33:from:127.0.2.255]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] X-Mailman-Approved-At: Thu, 01 Apr 2021 11:07:25 +0000 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: Thu, 01 Apr 2021 05:11:48 -0000 Am 31.03.2021 um 23:54 schrieb Dan Langille: > I have read a discussion of repo-copy, perhaps on the git mailing list. if you copy a file/directory and diretly stage it after the copy, git should automatically detect that it was copied. Gruß Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook From owner-freebsd-git@freebsd.org Thu Apr 1 12:17:52 2021 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 8920F5CBD5A for ; Thu, 1 Apr 2021 12:17:52 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FB2JJ3PfYz3jYR; Thu, 1 Apr 2021 12:17:52 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "R3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4930A23249; Thu, 1 Apr 2021 12:17:52 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:ab:0:3356:ef6b:256f:d0c6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 1FADE942D80; Thu, 1 Apr 2021 12:17:51 +0000 (UTC) Date: Thu, 1 Apr 2021 14:17:49 +0200 From: Mathieu Arnold To: Lars Liedtke Cc: freebsd-git@freebsd.org Subject: Re: Ports Repocopies Message-ID: <20210401121749.g4rtr4tmitibed5g@aching.in.mat.cc> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> <09169422-5c59-74a9-82ad-5d6d5fd17d7a@punkt.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="uwrwxn2nqt6x7rze" Content-Disposition: inline In-Reply-To: <09169422-5c59-74a9-82ad-5d6d5fd17d7a@punkt.de> 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: Thu, 01 Apr 2021 12:17:52 -0000 --uwrwxn2nqt6x7rze Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 01, 2021 at 12:39:46PM +0200, Lars Liedtke wrote: >=20 > >=A0 If you are talking about doing a svn copy/move to record the ancestr= y of >=20 > I believe this is not true. Maybe git does it differently than svn, I > don't know that; but git does record moves and copies, whilst copies are > like new files for=A0 and moves are deletion and addition, git as far as I > know. This this might not be explicit but implicit. Git does not record moves or copies. What git does, when running diff or status (or other commands using those in the background), and when you ask it to, is look around see if maybe, a new file looks like a file being removed (-M), or an existing one (-C). Sometime it gets it right, but most of the time it does not. --=20 Mathieu Arnold --uwrwxn2nqt6x7rze Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAmBlud9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgIQtQ/5AWJe2aZWpBh+BPPKgMjgj++y3A+x7WbJ96iJi+tNDUlGIuprn+ap6Job ZPRX+ET9oP49Elkkba4IAQCnijwlYyxv9UituXtSUQgPPyqfIG2OZDb0GREHjrqr ay3p1yQofG3BEyYTj66T0KmpEk8+XctItojfYBOFobK4a7E+YR2kI0AYQ0axUC1O tq7aPuebUHvmLUUbRm2yHrcXy+gPPEQGcdmaVGF+q99RbBIZjE+CfFL1eiVDYXnx TmRaA4ILUBFUs9n+dg2fIMSXJkMb/RziPY0Jf5SjQQDi5+4iQIpwYggXTtDUsOp2 4fPcoYAxEfVogBf4Wn47WHehF8t5RAEnpRyeTvOL+XC64TOHzNuL/FdWyomOrojW mGcGFIBaaEHY7Ox/5pZjHn4CGuuRLGuED7HtJ9aEpJfawYRVeJODXjJRejV211Xz dFuzs06hHikSCru4BzI0jSlIiw/XHhxtXvNyLinc9n30y0bkWi6Jjg7VjE6UHYKG 7FPALhDrEY+9GcjAFfrO3qbvUhPhoC1sIdUYyE4Z6s4gmpVwH/oV6fceEGJQYTJS vIhg6MYmFnR4eiaWMY0rT7V6AEaV3Wb/mteQAMPDlu0ivNmxYOO+DMTaMPxnKF9n AHcuZKf6v+ceGbDjCY/OaOcP54JY4H7Edp+Ajn/Cdxweha9PUxQ= =zRSC -----END PGP SIGNATURE----- --uwrwxn2nqt6x7rze-- From owner-freebsd-git@freebsd.org Thu Apr 1 15:31:02 2021 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 C7CE257BC61 for ; Thu, 1 Apr 2021 15:31:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 4FB6b96Km7z4RbN for ; Thu, 1 Apr 2021 15:31:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id g20so2594299qkk.1 for ; Thu, 01 Apr 2021 08:31:01 -0700 (PDT) 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=UC45tQwK+Bv+ewoGsSMnccq8/qNk8RpNH5SjPSshnVc=; b=1b1URwI+SUbbnHovhskc3bVyBJjIpaRr6cg0swKKLx4n+95sCxCE0jWX2Tva+HY1jn 79CCiMCDYORip9XbA3fL8fXvCtfCZ5rHqha5vM4f/ux3DtxewDFfvZDztP5whYLZzgSX 2mVg1ybO1ISEwbfiCD/2+bQSW6HAimzkKNSLgH579jRDqwhst0tUthxowdbAnvxiyIju rbOOCPKxrvraT6TAlXNR5uOBbfilblsH+PKtouozd+7MqLqIhOKzD+Bq4E4g11i2ZiEV gXaQwzhiTaN5GvboT/aMUZAN6ARv1yc9JO61cvuJdOC2KZMZptqRESFhw7Mm1DIdwcyc DJkA== 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=UC45tQwK+Bv+ewoGsSMnccq8/qNk8RpNH5SjPSshnVc=; b=n0dsYfmD/NOsaMqNKdAIfAmrLLiwtVVNd2umiAtuQUbCWRbKFOmtya4Bd83lXZ09yH o4n2FOQw4alULLGPv7FCBLwqSkAJGT/qlDziMs0JrXhcDrHPYzMRVdGSSEAYOv8ARuqK +gkas2gzRN5jhFngEyTwm5K5ME4eIwtngjiUTbshai2RzGLbNn/GrEiorYkxPf2vlLKN hhbLkfCbi7X6tm0ui5uQZe7uXpACjVg5gu2b56lD7XdkuNFccmlThUG0Ge6CCgXwE4au mqSIRdA5ZsELl5qFAvjF8l1Fk4Tctv7JmikOQdiIRwgNauWXWx+VZQR9mdXJmp7NOYRO 09jw== X-Gm-Message-State: AOAM531xU87sLtUKmmzLeaKWhrQBW4PEgqtnrwFMH8LHKDzKeqLv8p96 59pwoGD23vgd+XdfaBrhg/kT9ARgWdGKzwaTTkv95w== X-Google-Smtp-Source: ABdhPJxu+U//Gr2TFw2y2S5twOieM2CvEoyMHqRHT2KlTDSbScSOPPlDJnb9Q3YF8hfbiFBMEfWSm73cl5v28UpMmOw= X-Received: by 2002:a37:a085:: with SMTP id j127mr8544743qke.206.1617291060859; Thu, 01 Apr 2021 08:31:00 -0700 (PDT) MIME-Version: 1.0 References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> <09169422-5c59-74a9-82ad-5d6d5fd17d7a@punkt.de> In-Reply-To: <09169422-5c59-74a9-82ad-5d6d5fd17d7a@punkt.de> From: Warner Losh Date: Thu, 1 Apr 2021 09:30:49 -0600 Message-ID: Subject: Re: Ports Repocopies To: Lars Liedtke Cc: freebsd-git X-Rspamd-Queue-Id: 4FB6b96Km7z4RbN X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=1b1URwI+; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::735) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(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::735:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::735:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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::735:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" 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: Thu, 01 Apr 2021 15:31:02 -0000 On Thu, Apr 1, 2021 at 4:39 AM Lars Liedtke wrote: > > > If you are talking about doing a svn copy/move to record the ancestry of > > I believe this is not true. Maybe git does it differently than svn, I > don't know that; but git does record moves and copies, whilst copies are > like new files for and moves are deletion and addition, git as far as I > know. This this might not be explicit but implicit. > git absolutely does not record copies or moves. It guesses. Usually it guesses right, but sometimes it doesn't. Whatever process we use, we need to assume that will fail at some point. To overcome this, be explicit where things were copied from, and hashes when ports are resurrected in the commit message. Warner From owner-freebsd-git@freebsd.org Thu Apr 1 15:44:06 2021 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 0B78D57C5A3 for ; Thu, 1 Apr 2021 15:44:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 4FB6tF0Y1Mz4S5w for ; Thu, 1 Apr 2021 15:44:04 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82c.google.com with SMTP id c6so1788057qtc.1 for ; Thu, 01 Apr 2021 08:44:04 -0700 (PDT) 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=QZ75MjHFltosSPoog9LMChBgm14LgVUtfJZ6cms61ek=; b=jAwUa7FlAHUCJS5LBrxASU4q56ZPJ141gsiQnNCNvgKR7TrTW8SCEr/aWTuiJaW+ZG nHtS4pMnyN4JeNWt9WdseEkKUwvU+rb8ceRgE7uGtGOv37UySgJUrS8uTPnRiMJ6eWYz oCDOwTB9Lm0M876/d1A+UDXv7UaPMLhwI+a256czPN2xR9fVup0l+9pJPGOcHt76cgLl EZyAMTzQ5GC7o+wWr5GCq0sVC0OFhMVeLcDHogMgb6UlNUKBKtfK5sS4C4AwdNSHqS5l KFWsfX5o7mIAB9jf00g+nAzoimPBDC0JhIqqr1+feyj3VAg2SQWfWzuTCzjGGRoeMA1J advA== 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=QZ75MjHFltosSPoog9LMChBgm14LgVUtfJZ6cms61ek=; b=HLPuQPtddD4fV7ZadUtl035BiHq9yp344cHM4vjOuAogv8Agyanynb44tBBuGGS87y oHbikTf6U8BjXIFxJOp7GL6kR8TspkzWmq1Ykcr4BRjr0oQOTnW+/GzJLIKX4+//AeRR 4fmWVbY5tHGPDIrcUqWL6TVYQE4RJJMcdM/y4RALnKfx4lx/6ESdH4cmjFmqtX8wUvq3 QjpVD3Wei2kDUXI3ctANcFLo9UkdlODi8L5dGn3Iudz1LI4SQ1BG/aP7MiE22RN46GvD JXaGnRNHNgJmmB44W55ipGo3WBvzPfjHYfWeGGfRC/B825Ib8GXC+6aMxoK8GpbwIRK+ wFeQ== X-Gm-Message-State: AOAM530uE6USHHnZGdqkZ/+q/4Fm6dFLdzdIAgG75c7IwVaczfGw+oS+ oRElkMZAPBPEQX0bmZL/Ja5kSY9/7pun3y6BrySwOhfM4Y00Lg== X-Google-Smtp-Source: ABdhPJzhc5VNeGI8sh3Oexo+K4DYT4Eg43D1CiwmPjHCwLtPrQ9ZxfZ+L2zZYBfgf+0UKovwL+9rDyf69qbIO5iqZqo= X-Received: by 2002:a05:622a:3c8:: with SMTP id k8mr7720859qtx.101.1617291843299; Thu, 01 Apr 2021 08:44:03 -0700 (PDT) MIME-Version: 1.0 References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210331184820.GA26869@freefall.freebsd.org> <202103311859.12VIxlcn006294@slippy.cwsent.com> <6cf11fc8-d75e-451d-ada2-03a9f06048b4@www.fastmail.com> In-Reply-To: From: Warner Losh Date: Thu, 1 Apr 2021 09:43:52 -0600 Message-ID: Subject: Re: Ports Repocopies To: Matthias Fechner Cc: freebsd-git X-Rspamd-Queue-Id: 4FB6tF0Y1Mz4S5w X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=jAwUa7Fl; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82c) 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)[]; 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::82c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82c:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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::82c: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" 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: Thu, 01 Apr 2021 15:44:06 -0000 On Thu, Apr 1, 2021 at 5:07 AM Matthias Fechner wrote: > Am 31.03.2021 um 23:54 schrieb Dan Langille: > > I have read a discussion of repo-copy, perhaps on the git mailing list. > > if you copy a file/directory and diretly stage it after the copy, git > should automatically detect that it was copied. > If you do this, then Git is more likely to get it right, but Git is fallible. One feature of the ports tree is that it has lots of files which are only a little different from each other. However, there's two things that mitigates this design decision. First, files it gets wrong have so little data to preserve that when Git gets things wrong, recovering from it is usually trivial. Second, we're planning on adding extra data to the commit messages to thread the history back when git can't do it automatically should that be necessary after Git guesses wrong and we need to get to the history. It's believed this will be fairly rare. Warner From owner-freebsd-git@freebsd.org Fri Apr 2 10:02:18 2021 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 4AD715CA590 for ; Fri, 2 Apr 2021 10:02:18 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [144.76.20.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4FBbFP6pl9z4f4c for ; Fri, 2 Apr 2021 10:02:16 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id C7FB01E738D for ; Fri, 2 Apr 2021 12:02:05 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id kCrcvoHUu1NZ for ; Fri, 2 Apr 2021 12:02:05 +0200 (CEST) Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 9944A1E7411 for ; Fri, 2 Apr 2021 12:02:05 +0200 (CEST) To: freebsd-git@FreeBSD.org From: Martin Matuska Subject: OpenZFS branch tracking policy Message-ID: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> Date: Fri, 2 Apr 2021 12:02:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Rspamd-Queue-Id: 4FBbFP6pl9z4f4c X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:24940, ipnet:144.76.0.0/16, country:DE]; local_wl_from(0.00)[FreeBSD.org] 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: Fri, 02 Apr 2021 10:02:18 -0000 Dear git working group, OpenZFS 2.1 is approaching and there is an ongoing discussion between=20 the ZFS developers regarding branch tracking. What we want archieve: FreeBSD main will be tracking the master branch of openzfs/zfs FreeBSD stable/13 will be tracking the zfs-2.1-release and upcoming=20 staging branches of openzfs/zfs (they always have continuous commits) At the moment, I rsync changes from openzfs/zfs to our vendor/openfzfs=20 and commit them. The question is, if this is the correct way to do this? OpenZFS uses git so we might skip vendor/openzfs and subtree merge=20 directly from openzfs/master (and that way inherit all OpenZFS history)=20 and openzfs/zfs-2.1-release. That would be way easier to manage and we=20 can track and see "real" commits from OpenZFS. The other way would be like now, keep two vendor branches and rsync, but = that makes it harder to track. I would be really happy for a decision so I can start merging=20 zfs-2.1-release. Best regards, mm From owner-freebsd-git@freebsd.org Fri Apr 2 15:49:58 2021 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 6FBD557A9E5 for ; Fri, 2 Apr 2021 15:49:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4FBkyY2RNRz3K0s for ; Fri, 2 Apr 2021 15:49:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id 1so4007660qtb.0 for ; Fri, 02 Apr 2021 08:49:56 -0700 (PDT) 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=6giM+jCYk8prOOKxw+eoPZ5soUCpZb1UdhxN0dUY59Y=; b=0tvXOUBMlYBAkrp/0srBdG5yfzyxdc8xEzgo5tD4UBW1F+NZLWPAgyql6BHnvmt1pG tA0Mxwn+uNjA6s52Ffsj/uJBRTYBO47YNXhdMMoDxxaLIsnISrzdzOTltf6407xg85cE RHgeB72nv0+OkOUOBYCL1RBoOzXj1O8exsngBkpWD4rsYo/ka+BwvQzvnVi2CVn/5eHo R1V79p32EwMsb4dukGsrXqdQRtz/Bqm7KiiNRTezaHfPrhzIedP9P6nROku1NTMyrsqE VihycNwDVQAcxWHyuZo3ILJnJChcBOLmYBJufBdLWZb/ehCY8cZ+2wg6oUaAwzCow8pE FVTA== 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=6giM+jCYk8prOOKxw+eoPZ5soUCpZb1UdhxN0dUY59Y=; b=shIUwgoRCXicuCe4M58u1sCraku6eeMw76yq9AVQXhOTUrTT9ocbXbZyfmLEJYdkps RDxZDXq5WiDVEQI/UQRx0mbW+5t0uQ1RPgyuTid3Ssf4AWzzWYDPmyFJyxlRHp4juwzf qWdd1Da6dou7LAkRzVR9kfws6YcVBOTT9SdHQ1WYKjdppMMg9OlX2HDffAM/8mefjEpo u2CyC61x+twEHbBlI+tUJAeb9p9Qt15bFBXjw+Q5sqnZ9BE1qAtliTz8X+zd3nfy94wo ydPbHzAgyxNVn7PkbKwZMwjjDOGufiWwHmckbAwCPy0Pp92GFKbQH9o6hpccXxupmTST 0CxQ== X-Gm-Message-State: AOAM530jp4ZOzMsED3hlLWmQ/5w8jm41QMAbnvLK4f8zEzcm0nPwRSCs FrjnZlAFXC2hQxb08qAnvYIDtfXSBsAfK4cgU7ST8gjjIZRPgg== X-Google-Smtp-Source: ABdhPJwlDfZ9+EUVCiMBI2i2oAzNYpChGMtNpcMSHOWvks5pCiLdLizNhoIRjRzj2VLWE5okY3gO86C62sZrdV1f8oo= X-Received: by 2002:a05:622a:1c5:: with SMTP id t5mr11560770qtw.49.1617378596035; Fri, 02 Apr 2021 08:49:56 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> In-Reply-To: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> From: Warner Losh Date: Fri, 2 Apr 2021 09:49:45 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Martin Matuska Cc: freebsd-git X-Rspamd-Queue-Id: 4FBkyY2RNRz3K0s X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=0tvXOUBM; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::831) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(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::831:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; 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::831:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" 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: Fri, 02 Apr 2021 15:49:58 -0000 On Fri, Apr 2, 2021 at 4:02 AM Martin Matuska wrote: > Dear git working group, > > OpenZFS 2.1 is approaching and there is an ongoing discussion between > the ZFS developers regarding branch tracking. > > What we want archieve: > > FreeBSD main will be tracking the master branch of openzfs/zfs > FreeBSD stable/13 will be tracking the zfs-2.1-release and upcoming > staging branches of openzfs/zfs (they always have continuous commits) > > At the moment, I rsync changes from openzfs/zfs to our vendor/openfzfs > and commit them. > > The question is, if this is the correct way to do this? > OpenZFS uses git so we might skip vendor/openzfs and subtree merge > directly from openzfs/master (and that way inherit all OpenZFS history) > and openzfs/zfs-2.1-release. That would be way easier to manage and we > can track and see "real" commits from OpenZFS. > > The other way would be like now, keep two vendor branches and rsync, but > that makes it harder to track. > > I would be really happy for a decision so I can start merging > zfs-2.1-release. > We'd anticipated this need. But have some questions. The first question is: do you have a concrete set of instructions for how you plan on doing this written up yet? It's not necessary, but if you did I could comment on things in more detail. We'd always hoped that we'd be able to do subtree merges from upstreams that use git into FreeBSD. The big worry, though, was that this would needless bloat the repo with a lot of history. We don't want, for example, all of LLVM's history in the tree. We'd always anticipated that there'd be some things we'd just accept the history for, since it is similar in character to the vendor branches (though of course a bit more). So the first question I have is what's the rate of commits to OpenZFS? If you were to do the above in the straightforward way, then our repo grows at a rate that's the sum of both projects. If it is low enough, the straightforward way is likely the best way, though with some kind of explicit guidance on what's "too much" or "too big". We'll also need to manage the upstream branch naming somehow. I think we should talk to uqs@ before we do anything because he's got a much better handle on the subtle issues that will arise and can recommend something reasonable there. Ditto any tags we want to import from upstream, should we go this route. We'd talked about ways of even doing this with LLVM in some way that would push the merge commits w/o pushing all the history to the central repo with explicit instructions for others that wish to do the next one in case that person changes. We'd thought there'd be a role for some aux repo to act as a staging area for some of this so we needn't bloat the main repo. A 'vendor repo' that's a refinement of the 'vendor branch' we now are using with some kind of guard to prevent the 'vendor repo' from seeping into the main repo. But the notions we talked about were vague and we never proceeded beyond talk in how to cope with a future where people want to do the sorts of things you are talking about. Warner From owner-freebsd-git@freebsd.org Fri Apr 2 17:56:26 2021 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 402F257D72D for ; Fri, 2 Apr 2021 17:56:26 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 4FBnmV1M05z3hbx; Fri, 2 Apr 2021 17:56:25 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f171.google.com with SMTP id u2so5254241ilk.1; Fri, 02 Apr 2021 10:56:25 -0700 (PDT) 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=yKRV0GTo+o3UFnkXXnFi7vMLX2LL2+FzqmzvanG6GYc=; b=Y24O0Ps8yFQRVeY2B/ED0y++uyp1Dl36ktjtMfdC4ZKNT+nOo0bFRB6BXZdqdm+BJe 51/ffnYPq7vswRUqme3nGm88uVFb6dMbO5hweEjPq7AobjI9IxiuDeenJtzBdotHGnBW WJ2VSg3FSCKovZRcDyV8s/sSquN8xnFtdVv8w5SYIc/h+G/JpZG0LmVtgkgNmNkf4wXR c+k5rIElcuuIbaSHzhqTxzNKda+JxQlWEowxphyD66G7OV8UIUAjPL75Wz1eZlshTQct +tDzlueVVykaOXtEgsLsSLLl4WksfEMkfKDg7Dd3Z+xrsWWvrt6wxts8grpJSBvYVsry M2fQ== X-Gm-Message-State: AOAM531e4QS+kiJ+Z/ZqrHcrmi54KUHtbir30ZpIiGoDN9XYsfJjjiWG zlDRnHC4rMKgMo+jovVe5eQaa9b1HINQosfo80o= X-Google-Smtp-Source: ABdhPJz2RnYJxgoRYHUZgk+frO5Mt1S2zylrMwvxu/KcGWRHWSIdzwHPgE4jg7sh9N1ur9phfOy5xT6K6s0v+j5JYZ4= X-Received: by 2002:a92:902:: with SMTP id y2mr11587257ilg.98.1617386184893; Fri, 02 Apr 2021 10:56:24 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Fri, 2 Apr 2021 13:56:03 -0400 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Warner Losh Cc: Martin Matuska , freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4FBnmV1M05z3hbx X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Fri, 02 Apr 2021 17:56:26 -0000 On Fri, 2 Apr 2021 at 11:50, Warner Losh wrote: > > We'd always hoped that we'd be able to do subtree merges from upstreams > that use git into FreeBSD. The big worry, though, was that this would > needless bloat the repo with a lot of history. We don't want, for example, > all of LLVM's history in the tree. We'd always anticipated that there'd be > some things we'd just accept the history for, since it is similar in > character to the vendor branches (though of course a bit more). Note that if we do want to avoid bringing in the full history `git subtree merge` supports a `--squash` option. This brings in the set of upstream changes as a single commit, without bringing along the associated history. We will need to do more experimentation to confirm that the full process, including bootstrapping, will work as we want. Assuming this all works it should allow us to forgo the use of a FreeBSD-specific vendor branch in src. We've discussed mirroring any such 3rd-party source in some FreeBSD-controlled repository. This would allow the project to retain a full copy of the history, but avoid bloating src with it. I agree with Warner that we may want a different policy (full history or snapshots) for different contrib sources. From owner-freebsd-git@freebsd.org Fri Apr 2 18:15:12 2021 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 E3E0457DD84 for ; Fri, 2 Apr 2021 18:15:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 4FBpB85jkQz3jDN for ; Fri, 2 Apr 2021 18:15:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2f.google.com with SMTP id j17so2825720qvo.13 for ; Fri, 02 Apr 2021 11:15:12 -0700 (PDT) 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=uASzFalZIOkOMdtP5+MNvBKPoey+I0vn5p5rYG0ixi4=; b=dXe4dyyqC6Pl9xRX6aljg/ecmpcP3NBKMyvWOTsXTx9oTehSyBL9ZCAs3GFXk7N4r8 RJpq5CaSCO31oDpbE4jdU6dHNUC1sTRXeq8DlkK8qrk/K7OyK8lVjcvXJ9Qg75ydRvWK 8C91VWL8IAS6n8ll17yfxkr3GfFqxKAbpyC1xxf9M3+3LLPHptyepJ+f2mpOZciifG3L gwKzyiDul/Y7W2zUxdP0SmivY3D3LcFrwCn8AoUkfs5kzRJTDgXLpSF4HF9Tgbh8cLUQ 3wIwjZ6W+eKtbwzQtI2Hv1o1bE8ghOiudXQqzpi/g5G3IrLd5QiSVEGl2OCBndcI/Uq1 5UOA== 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=uASzFalZIOkOMdtP5+MNvBKPoey+I0vn5p5rYG0ixi4=; b=mfGovZLzXVwqaca0FPQUkIgSONwW07vxNzqopTbjSSrWPfp6PIcSdDfLXT6T8GmNh7 OMCgifLMPVggaAKFhXVc454iYW0NDwdSzvlr6HPzF3BPEdmm7PST/6TPDb+oB9UrTvRD 0EUOrKhUPEw9LXjKmzL30GxJeN0pko6g24rMhK4Ms0ODXCwERTPI+ua4IYhhOfyf3Js+ HpTv1MaK/8E8UGmx6qheBp59mqTLIFvmT3Pl5LJu8sgl+eVXfU09wY7Cmv0oHYrVIFOw 5sRVYxX71HpNzp/g8FjT1RiHEX0WFsd6QfxKjpTNEeP382cn0iPBkZ81j0jYBI56bSxG FsVA== X-Gm-Message-State: AOAM531hlE5DHfxOUtpZOaufTsoo4saJugjiAVmseAqhuQ70L6bYI2RX qxzFi+Sc4GUC5KFzSErblVJGoPq41jpv3FDkGsRWaQ== X-Google-Smtp-Source: ABdhPJwlosaYROZq2P3LHOmxM5nstivkCBG4HJ2d0+SeViHcZhH8nZA3QcsZLpmXiSIJDSK8bN7F5xioN7BxHIkxjJ0= X-Received: by 2002:a05:6214:aae:: with SMTP id ew14mr14122514qvb.24.1617387311835; Fri, 02 Apr 2021 11:15:11 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Fri, 2 Apr 2021 12:15:00 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Ed Maste Cc: Martin Matuska , freebsd-git X-Rspamd-Queue-Id: 4FBpB85jkQz3jDN 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: 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: Fri, 02 Apr 2021 18:15:13 -0000 On Fri, Apr 2, 2021 at 11:56 AM Ed Maste wrote: > On Fri, 2 Apr 2021 at 11:50, Warner Losh wrote: > > > > We'd always hoped that we'd be able to do subtree merges from upstreams > > that use git into FreeBSD. The big worry, though, was that this would > > needless bloat the repo with a lot of history. We don't want, for > example, > > all of LLVM's history in the tree. We'd always anticipated that there'd > be > > some things we'd just accept the history for, since it is similar in > > character to the vendor branches (though of course a bit more). > > Note that if we do want to avoid bringing in the full history `git > subtree merge` supports a `--squash` option. This brings in the set of > upstream changes as a single commit, without bringing along the > associated history. We will need to do more experimentation to confirm > that the full process, including bootstrapping, will work as we want. > Assuming this all works it should allow us to forgo the use of a > FreeBSD-specific vendor branch in src. > > We've discussed mirroring any such 3rd-party source in some > FreeBSD-controlled repository. This would allow the project to retain > a full copy of the history, but avoid bloating src with it. > > I agree with Warner that we may want a different policy (full history > or snapshots) for different contrib sources. > Good points Ed. I'd forgotten about --squash. Martin, what's your timeline for wanting to implement these things? I'm unfamiliar with the OpenZFS schedules. Warner From owner-freebsd-git@freebsd.org Fri Apr 2 23:37:48 2021 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 CC7555B65D6 for ; Fri, 2 Apr 2021 23:37:48 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [144.76.20.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4FBxLN4c51z4ZCM; Fri, 2 Apr 2021 23:37:48 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 2E8331E25DC; Sat, 3 Apr 2021 01:37:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id 5s--EOQy_7xE; Sat, 3 Apr 2021 01:37:42 +0200 (CEST) Received: from [10.9.8.144] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id B21471E2657; Sat, 3 Apr 2021 01:37:41 +0200 (CEST) To: Warner Losh , Ed Maste Cc: freebsd-git References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> From: Martin Matuska Subject: Re: OpenZFS branch tracking policy Message-ID: <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> Date: Sat, 3 Apr 2021 01:37:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Rspamd-Queue-Id: 4FBxLN4c51z4ZCM 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; format=flowed 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: Fri, 02 Apr 2021 23:37:48 -0000 Hi Warner and Ed, 2.1-release has already been branched. The stable branch policy in=20 OpenZFS is somewhat strange, they make a staging branch for each=20 patchlevel release, but the commits are continuous. To have some idea how big the repo history is: $ git rev-list master --count 6662 $ git rev-list zfs-2.1-release --count 6650 master and zfs-2.1-release have 6650 common commits at the=C2=A0 moment $ git log master | wc -l 129868 (linecount - 4 * revcount) / revcount =3D linecount / revcount - 4 =3D=20 15,4938 comment lines per commit on average Initial commit was made in Feb 26, 2008. Yearly commit counts: $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' 666 $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' 535 $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' 428 Martin On 2. 4. 2021 20:15, Warner Losh wrote: > > > On Fri, Apr 2, 2021 at 11:56 AM Ed Maste > wrote: > > On Fri, 2 Apr 2021 at 11:50, Warner Losh > wrote: > > > > We'd always hoped that we'd be able to do subtree merges from > upstreams > > that use git into FreeBSD. The big worry, though, was that this > would > > needless bloat the repo with a lot of history. We don't want, > for example, > > all of LLVM's history in the tree. We'd always anticipated that > there'd be > > some things we'd just accept the history for, since it is similar= in > > character to the vendor branches (though of course a bit more). > > Note that if we do want to avoid bringing in the full history `git > subtree merge` supports a `--squash` option. This brings in the set= of > upstream changes as a single commit, without bringing along the > associated history. We will need to do more experimentation to conf= irm > that the full process, including bootstrapping, will work as we wan= t. > Assuming this all works it should allow us to forgo the use of a > FreeBSD-specific vendor branch in src. > > We've discussed mirroring any such 3rd-party source in some > FreeBSD-controlled repository. This would allow the project to reta= in > a full copy of the history, but avoid bloating src with it. > > I agree with Warner that we may want a different policy (full histo= ry > or snapshots) for different contrib sources. > > > Good points Ed. I'd forgotten about --squash. > > Martin, what's your timeline for wanting to implement these things?=20 > I'm unfamiliar with the OpenZFS schedules. > > Warner From owner-freebsd-git@freebsd.org Sat Apr 3 00:44:39 2021 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 3637E5B8C32 for ; Sat, 3 Apr 2021 00:44:39 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [144.76.20.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4FByqV5xdkz4dHB; Sat, 3 Apr 2021 00:44:38 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id EB7E91E3673; Sat, 3 Apr 2021 02:44:37 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id mlFNQD6lQ_b4; Sat, 3 Apr 2021 02:44:37 +0200 (CEST) Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 5C4B01E36E7; Sat, 3 Apr 2021 02:44:37 +0200 (CEST) Subject: Re: OpenZFS branch tracking policy From: Martin Matuska To: Warner Losh , Ed Maste Cc: freebsd-git , Xin Li , Ryan Moeller , Alexander Motin , Mateusz Guzik References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> Message-ID: <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> Date: Sat, 3 Apr 2021 02:44:36 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4FByqV5xdkz4dHB X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; ASN(0.00)[asn:24940, ipnet:144.76.0.0/16, country:DE] 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, 03 Apr 2021 00:44:39 -0000 I have prepared an example merged branch here: https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged The magical command was: git merge -s subtree -Xsubtree=3D"sys/contrib/openzfs" 891568c99=20 --allow-unrelated-histories Luckily, our current diff is manageable. Martin On 3. 4. 2021 1:37, Martin Matuska wrote: > Hi Warner and Ed, > > 2.1-release has already been branched. The stable branch policy in=20 > OpenZFS is somewhat strange, they make a staging branch for each=20 > patchlevel release, but the commits are continuous. > > To have some idea how big the repo history is: > > $ git rev-list master --count > 6662 > > $ git rev-list zfs-2.1-release --count > 6650 > > master and zfs-2.1-release have 6650 common commits at the=C2=A0 moment > > $ git log master | wc -l > 129868 > > (linecount - 4 * revcount) / revcount =3D linecount / revcount - 4 =3D=20 > 15,4938 comment lines per commit on average > > Initial commit was made in Feb 26, 2008. > > Yearly commit counts: > > $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' > 666 > > $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' > 535 > > $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' > 428 > > Martin > > On 2. 4. 2021 20:15, Warner Losh wrote: >> >> >> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste > > wrote: >> >> =C2=A0=C2=A0=C2=A0 On Fri, 2 Apr 2021 at 11:50, Warner Losh > =C2=A0=C2=A0=C2=A0 > wrote: >> =C2=A0=C2=A0=C2=A0 > >> =C2=A0=C2=A0=C2=A0 > We'd always hoped that we'd be able to do subtree= merges from >> =C2=A0=C2=A0=C2=A0 upstreams >> =C2=A0=C2=A0=C2=A0 > that use git into FreeBSD. The big worry, though,= was that this >> =C2=A0=C2=A0=C2=A0 would >> =C2=A0=C2=A0=C2=A0 > needless bloat the repo with a lot of history. We= don't want, >> =C2=A0=C2=A0=C2=A0 for example, >> =C2=A0=C2=A0=C2=A0 > all of LLVM's history in the tree. We'd always an= ticipated that >> =C2=A0=C2=A0=C2=A0 there'd be >> =C2=A0=C2=A0=C2=A0 > some things we'd just accept the history for, sin= ce it is=20 >> similar in >> =C2=A0=C2=A0=C2=A0 > character to the vendor branches (though of cours= e a bit more). >> >> =C2=A0=C2=A0=C2=A0 Note that if we do want to avoid bringing in the fu= ll history `git >> =C2=A0=C2=A0=C2=A0 subtree merge` supports a `--squash` option. This b= rings in the=20 >> set of >> =C2=A0=C2=A0=C2=A0 upstream changes as a single commit, without bringi= ng along the >> =C2=A0=C2=A0=C2=A0 associated history. We will need to do more experim= entation to=20 >> confirm >> =C2=A0=C2=A0=C2=A0 that the full process, including bootstrapping, wil= l work as we=20 >> want. >> =C2=A0=C2=A0=C2=A0 Assuming this all works it should allow us to forgo= the use of a >> =C2=A0=C2=A0=C2=A0 FreeBSD-specific vendor branch in src. >> >> =C2=A0=C2=A0=C2=A0 We've discussed mirroring any such 3rd-party source= in some >> =C2=A0=C2=A0=C2=A0 FreeBSD-controlled repository. This would allow the= project to=20 >> retain >> =C2=A0=C2=A0=C2=A0 a full copy of the history, but avoid bloating src = with it. >> >> =C2=A0=C2=A0=C2=A0 I agree with Warner that we may want a different po= licy (full=20 >> history >> =C2=A0=C2=A0=C2=A0 or snapshots) for different contrib sources. >> >> >> Good points Ed. I'd forgotten about --squash. >> >> Martin, what's your timeline for wanting to implement these things?=20 >> I'm unfamiliar with the OpenZFS schedules. >> >> Warner > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From owner-freebsd-git@freebsd.org Sat Apr 3 00:51:43 2021 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 AED995B8AAC for ; Sat, 3 Apr 2021 00:51:43 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [144.76.20.103]) by mx1.freebsd.org (Postfix) with ESMTP id 4FByzg3gjcz4dwF; Sat, 3 Apr 2021 00:51:43 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id B6AE41E3775; Sat, 3 Apr 2021 02:51:42 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id 30YyDuEv_DlL; Sat, 3 Apr 2021 02:51:42 +0200 (CEST) Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 5CDD21E38C2; Sat, 3 Apr 2021 02:51:42 +0200 (CEST) Subject: Re: OpenZFS branch tracking policy From: Martin Matuska To: Warner Losh , Ed Maste Cc: freebsd-git , Alexander Motin , Mateusz Guzik , Ryan Moeller References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> Message-ID: <323a07e2-beeb-deb3-3fa5-bd1241a2cb04@FreeBSD.org> Date: Sat, 3 Apr 2021 02:51:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4FByzg3gjcz4dwF X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:24940, ipnet:144.76.0.0/16, country:DE]; local_wl_from(0.00)[FreeBSD.org] 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, 03 Apr 2021 00:51:43 -0000 I have missed one more thing: Tracking different OpenZFS branches in main and stable/13 means that we=20 will be vendor-merging into stable/13 as well (opposed to cherry-picking)= . On 3. 4. 2021 2:44, Martin Matuska wrote: > I have prepared an example merged branch here: > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > The magical command was: > git merge -s subtree -Xsubtree=3D"sys/contrib/openzfs" 891568c99=20 > --allow-unrelated-histories > > Luckily, our current diff is manageable. > > Martin > > On 3. 4. 2021 1:37, Martin Matuska wrote: >> Hi Warner and Ed, >> >> 2.1-release has already been branched. The stable branch policy in=20 >> OpenZFS is somewhat strange, they make a staging branch for each=20 >> patchlevel release, but the commits are continuous. >> >> To have some idea how big the repo history is: >> >> $ git rev-list master --count >> 6662 >> >> $ git rev-list zfs-2.1-release --count >> 6650 >> >> master and zfs-2.1-release have 6650 common commits at the moment >> >> $ git log master | wc -l >> 129868 >> >> (linecount - 4 * revcount) / revcount =3D linecount / revcount - 4 =3D= =20 >> 15,4938 comment lines per commit on average >> >> Initial commit was made in Feb 26, 2008. >> >> Yearly commit counts: >> >> $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' >> 666 >> >> $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' >> 535 >> >> $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' >> 428 >> >> Martin >> >> On 2. 4. 2021 20:15, Warner Losh wrote: >>> >>> >>> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste >> > wrote: >>> >>> =C2=A0=C2=A0=C2=A0 On Fri, 2 Apr 2021 at 11:50, Warner Losh >> =C2=A0=C2=A0=C2=A0 > wrote: >>> =C2=A0=C2=A0=C2=A0 > >>> =C2=A0=C2=A0=C2=A0 > We'd always hoped that we'd be able to do subtre= e merges from >>> =C2=A0=C2=A0=C2=A0 upstreams >>> =C2=A0=C2=A0=C2=A0 > that use git into FreeBSD. The big worry, though= , was that this >>> =C2=A0=C2=A0=C2=A0 would >>> =C2=A0=C2=A0=C2=A0 > needless bloat the repo with a lot of history. W= e don't want, >>> =C2=A0=C2=A0=C2=A0 for example, >>> =C2=A0=C2=A0=C2=A0 > all of LLVM's history in the tree. We'd always a= nticipated that >>> =C2=A0=C2=A0=C2=A0 there'd be >>> =C2=A0=C2=A0=C2=A0 > some things we'd just accept the history for, si= nce it is=20 >>> similar in >>> =C2=A0=C2=A0=C2=A0 > character to the vendor branches (though of cour= se a bit more). >>> >>> =C2=A0=C2=A0=C2=A0 Note that if we do want to avoid bringing in the f= ull history `git >>> =C2=A0=C2=A0=C2=A0 subtree merge` supports a `--squash` option. This = brings in the=20 >>> set of >>> =C2=A0=C2=A0=C2=A0 upstream changes as a single commit, without bring= ing along the >>> =C2=A0=C2=A0=C2=A0 associated history. We will need to do more experi= mentation to=20 >>> confirm >>> =C2=A0=C2=A0=C2=A0 that the full process, including bootstrapping, wi= ll work as we=20 >>> want. >>> =C2=A0=C2=A0=C2=A0 Assuming this all works it should allow us to forg= o the use of a >>> =C2=A0=C2=A0=C2=A0 FreeBSD-specific vendor branch in src. >>> >>> =C2=A0=C2=A0=C2=A0 We've discussed mirroring any such 3rd-party sourc= e in some >>> =C2=A0=C2=A0=C2=A0 FreeBSD-controlled repository. This would allow th= e project to=20 >>> retain >>> =C2=A0=C2=A0=C2=A0 a full copy of the history, but avoid bloating src= with it. >>> >>> =C2=A0=C2=A0=C2=A0 I agree with Warner that we may want a different p= olicy (full=20 >>> history >>> =C2=A0=C2=A0=C2=A0 or snapshots) for different contrib sources. >>> >>> >>> Good points Ed. I'd forgotten about --squash. >>> >>> Martin, what's your timeline for wanting to implement these things?=20 >>> I'm unfamiliar with the OpenZFS schedules. >>> >>> Warner >> _______________________________________________ >> freebsd-git@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/freebsd-git >> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From owner-freebsd-git@freebsd.org Sat Apr 3 01:32:58 2021 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 4E87C5BA601 for ; Sat, 3 Apr 2021 01:32:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (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 4FBzvF39Fxz4hVL for ; Sat, 3 Apr 2021 01:32:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id y2so4761595qtw.13 for ; Fri, 02 Apr 2021 18:32:57 -0700 (PDT) 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=YrUjYasYt6NBKYaua37XRiKFuaCQ/rlNXoS3/4ZrA9k=; b=LZehBFIbyjPAr4ERwZHNNaVdKpd9FGk0cO/CioWMGx8wRcGhXpYj7kjgZE31UCOzmd 7942NMU1/XcM5J1MyfdgH1B/DTxBY19lY00/ZCnIJOF72n3pDH/HvhnFi3qbUQp9oa7W PmSRSCz7QkSuFZf7l/dcFSGuLEATsiplrgg2Cvg1B1LTAXP36chUxX2d+DKNRX6hl3Vf A3WPflpI7EVp/aBFVSnkT8BMqNNH2gRljMx2wxq5ea0eS/TIdGHVgU5QWLMJcM4i1nWg NdhCAYP7zR7kK1v0Zs3OfbM3+CbGmfKaIZE1PAk0PDCp/aToD9Dj8KyJezb5lU2Skb3/ +/Kw== 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=YrUjYasYt6NBKYaua37XRiKFuaCQ/rlNXoS3/4ZrA9k=; b=aSgsvtjXBwaJ/T40buuPpJ7ApJIcOpOlEOHTmLO85Ct5rp2DT3g6mgiuLe+oV+nHN1 pKEj28rVO/ncO5TZ1+x94z5/wd2uxbyjQk9sbZZlQLQrbO2bjGyWIBUEeK0Gncq7dT64 wQS4Q8b/R0gO0v5uHupsML6h+krhzk9lWYRGU3arhINIbX4x3hvWJkQm1vpQAls8e729 nhbt26EJfqv7DJo4DgeJ96h1RAdRSOXxq50hJUZds/BI6cGSvFgkvTJd0Cm5zSTVWD2m m9qWhpghUuVchw/AlW2Thtck/X+OeNqh2D4lm8x2EVQaNNVTr0ryyiEyEFq6i47TJqcu GLSw== X-Gm-Message-State: AOAM530JqYymZgKDrANniaUUYx7fQ+KdH/Q0hbFPAwwaeCLt40NkUpOd 2322ofa5AM7YtjMUOcQ9GKJuZ+RHaXDgMs+8P8iubFMEw+RrNQ== X-Google-Smtp-Source: ABdhPJxorZkic+EJgbcTSI5BaUZsU4Wz12q6VcpfIBx++O7ixduFFv3k7jfT3cE8BiNsaIt8Cy0T+zI/Q/gUVJsohes= X-Received: by 2002:ac8:7e95:: with SMTP id w21mr13854462qtj.244.1617413576478; Fri, 02 Apr 2021 18:32:56 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> <41924e9d-9d61-6646-6c8f-e4458f94296e@FreeBSD.org> <30f529c1-6087-e704-8cc7-0c48a40b7430@FreeBSD.org> <323a07e2-beeb-deb3-3fa5-bd1241a2cb04@FreeBSD.org> In-Reply-To: <323a07e2-beeb-deb3-3fa5-bd1241a2cb04@FreeBSD.org> From: Warner Losh Date: Fri, 2 Apr 2021 19:32:44 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Martin Matuska Cc: Ed Maste , freebsd-git , Alexander Motin , Mateusz Guzik , Ryan Moeller X-Rspamd-Queue-Id: 4FBzvF39Fxz4hVL X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=LZehBFIb; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::831) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(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]; RCPT_COUNT_FIVE(0.00)[6]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::831:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.999]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::831: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::831:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" 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, 03 Apr 2021 01:32:58 -0000 Oh good point. I'll try to take a look this weekend... well, maybe Monday since it is Easter weekend. Warner On Fri, Apr 2, 2021, 6:51 PM Martin Matuska wrote: > I have missed one more thing: > Tracking different OpenZFS branches in main and stable/13 means that we > will be vendor-merging into stable/13 as well (opposed to cherry-picking). > > On 3. 4. 2021 2:44, Martin Matuska wrote: > > I have prepared an example merged branch here: > > https://github.com/mmatuska/freebsd-src/tree/openzfs_master_merged > > > > The magical command was: > > git merge -s subtree -Xsubtree="sys/contrib/openzfs" 891568c99 > > --allow-unrelated-histories > > > > Luckily, our current diff is manageable. > > > > Martin > > > > On 3. 4. 2021 1:37, Martin Matuska wrote: > >> Hi Warner and Ed, > >> > >> 2.1-release has already been branched. The stable branch policy in > >> OpenZFS is somewhat strange, they make a staging branch for each > >> patchlevel release, but the commits are continuous. > >> > >> To have some idea how big the repo history is: > >> > >> $ git rev-list master --count > >> 6662 > >> > >> $ git rev-list zfs-2.1-release --count > >> 6650 > >> > >> master and zfs-2.1-release have 6650 common commits at the moment > >> > >> $ git log master | wc -l > >> 129868 > >> > >> (linecount - 4 * revcount) / revcount = linecount / revcount - 4 = > >> 15,4938 comment lines per commit on average > >> > >> Initial commit was made in Feb 26, 2008. > >> > >> Yearly commit counts: > >> > >> $ git log master | grep -c -E '^Date:.* 2020 -[0-9]+$' > >> 666 > >> > >> $ git log master | grep -c -E '^Date:.* 2019 -[0-9]+$' > >> 535 > >> > >> $git log master | grep -c -E '^Date:.* 2018 -[0-9]+$' > >> 428 > >> > >> Martin > >> > >> On 2. 4. 2021 20:15, Warner Losh wrote: > >>> > >>> > >>> On Fri, Apr 2, 2021 at 11:56 AM Ed Maste >>> > wrote: > >>> > >>> On Fri, 2 Apr 2021 at 11:50, Warner Losh >>> > wrote: > >>> > > >>> > We'd always hoped that we'd be able to do subtree merges from > >>> upstreams > >>> > that use git into FreeBSD. The big worry, though, was that this > >>> would > >>> > needless bloat the repo with a lot of history. We don't want, > >>> for example, > >>> > all of LLVM's history in the tree. We'd always anticipated that > >>> there'd be > >>> > some things we'd just accept the history for, since it is > >>> similar in > >>> > character to the vendor branches (though of course a bit more). > >>> > >>> Note that if we do want to avoid bringing in the full history `git > >>> subtree merge` supports a `--squash` option. This brings in the > >>> set of > >>> upstream changes as a single commit, without bringing along the > >>> associated history. We will need to do more experimentation to > >>> confirm > >>> that the full process, including bootstrapping, will work as we > >>> want. > >>> Assuming this all works it should allow us to forgo the use of a > >>> FreeBSD-specific vendor branch in src. > >>> > >>> We've discussed mirroring any such 3rd-party source in some > >>> FreeBSD-controlled repository. This would allow the project to > >>> retain > >>> a full copy of the history, but avoid bloating src with it. > >>> > >>> I agree with Warner that we may want a different policy (full > >>> history > >>> or snapshots) for different contrib sources. > >>> > >>> > >>> Good points Ed. I'd forgotten about --squash. > >>> > >>> Martin, what's your timeline for wanting to implement these things? > >>> I'm unfamiliar with the OpenZFS schedules. > >>> > >>> Warner > >> _______________________________________________ > >> freebsd-git@freebsd.org mailing list > >> https://lists.freebsd.org/mailman/listinfo/freebsd-git > >> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > > _______________________________________________ > > freebsd-git@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-git > > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Sat Apr 3 03:03:11 2021 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 1F8495BD0BD for ; Sat, 3 Apr 2021 03:03:11 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) (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 4FC1vK6YTkz4nLJ for ; Sat, 3 Apr 2021 03:03:09 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: by mail-wm1-x331.google.com with SMTP id k128so3200445wmk.4 for ; Fri, 02 Apr 2021 20:03:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding:content-language; bh=n28HgenyeuNParvJpscxRKpvMHMhkp7mDkoVrz5XhQ8=; b=S6oYIY92rPbdFPhimlC8oDrSvYjcTy7ExYFaMSknh7zW4xUWJkQJqTh0jZU7Nm4TqK QzRF1/VMK2tKqXdHikoQfzntEMlyEjEg0LVjJ1kyIyQ2AH/CVDyPP6/fr0sBEx9gZMhJ mhxuHX9tQi9ZlV/rR7I9gMS69PtXXi+tTUv/DICG4gKIq9wv0jTLz26UgjQIie78+uiU 3TSSZfWyC8GB6k2V7uORoTYEubB0CsXAvZksozruSptP+/7ycooc6QmPfrt0grZ5GmBn 43eC9Fsjq9ZAFS07965UZJCPnjE5YaYsQTd0zHg1oq18Z2Om0xpNimCVyO66NmgMLTAi Qx3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding:content-language; bh=n28HgenyeuNParvJpscxRKpvMHMhkp7mDkoVrz5XhQ8=; b=Z9G9nuFEbPwCwhqVWniNVYwuGTg/mIJEsF6PkikPB9gXWClC5prdvTVbcC3lMygEzG bJ/BHnaObnFz6OhnRa0I+jcGyKnLnZ1RapOOp966DHULhh5MP/WE7B4dqbTQ7wbhqRSw +EcXSs45XzC4CIPGIf8OLLW+m7Sp0xaFqqvXuQ8Y7cDXToiiZ0oOUGPmEFM5+z63hO5T ZgJGUTqLffvBXw2jM5sUi/8yDCBOJDgVrHOAt/AEpAwfyzvCrZbNHoHvAG9XOBH/rCwJ iEqUMgGG0r8EPTTq0m7LE4UGR/4uWBtYIAHjPTbd/D64ETac8EKh03SjZ/Gag5xXGz9P qBcQ== X-Gm-Message-State: AOAM533s2yN89F6MQ1ZFdrz7aeNguY8fWwrgXgz3JPCtS/X5VT/P6baW 2RE7VMSWCV758mlNCI49AljvfJnY3VNspQ== X-Google-Smtp-Source: ABdhPJyGW92A4tqo/zB9x9TUDpNkgrSfrOVfBey58fbX7MeC05EhyAQRjvi0n7bj/5ztDSXenm1BpA== X-Received: by 2002:a1c:7e45:: with SMTP id z66mr15118796wmc.126.1617418987858; Fri, 02 Apr 2021 20:03:07 -0700 (PDT) Received: from [192.168.1.13] (88-105-96-80.dynamic.dsl.as9105.com. [88.105.96.80]) by smtp.gmail.com with ESMTPSA id h9sm13958616wmb.35.2021.04.02.20.03.07 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Apr 2021 20:03:07 -0700 (PDT) To: freebsd-git@freebsd.org From: Graham Perrin Subject: 2014Q1 by default Message-ID: <9d8bb6e0-b89e-8866-4b6c-6f920c7cb933@gmail.com> Date: Sat, 3 Apr 2021 04:03:06 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-Rspamd-Queue-Id: 4FC1vK6YTkz4nLJ X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=S6oYIY92; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::331 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[88.105.96.80:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::331:from]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::331:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::331:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] 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, 03 Apr 2021 03:03:11 -0000 defaults to 2014Q1 (not main). Given the transition, is this intended? I might have mentioned an unexpected default a few weeks ago. From owner-freebsd-git@freebsd.org Sat Apr 3 07:50:06 2021 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 618D85C3059 for ; Sat, 3 Apr 2021 07:50:06 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FC8GP6mvSz3MKL for ; Sat, 3 Apr 2021 07:50:05 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 1337nu68069340 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 3 Apr 2021 09:49:57 +0200 (CEST) (envelope-from uqs@freebsd.org) Date: Sat, 3 Apr 2021 09:49:56 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Graham Perrin Cc: freebsd-git@freebsd.org Subject: Re: 2014Q1 by default Message-ID: References: <9d8bb6e0-b89e-8866-4b6c-6f920c7cb933@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <9d8bb6e0-b89e-8866-4b6c-6f920c7cb933@gmail.com> User-Agent: Mutt/2.0.3 (2020-12-04) X-Rspamd-Queue-Id: 4FC8GP6mvSz3MKL X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH] 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, 03 Apr 2021 07:50:06 -0000 On Sat, 2021-04-03 at 04:03:06 +0100, Graham Perrin wrote: > defaults to 2014Q1 (not main). >Given the transition, is this intended? > >I might have mentioned an unexpected default a few weeks ago. Thanks for reporting that. I've changed HEAD to point to main instead, so now it shows up properly. We'll need to check that on the production setup as well, once that is live. Cheers Uli