From owner-freebsd-git@freebsd.org Wed Jul 15 07:45:59 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8AB3235CEF4 for ; Wed, 15 Jul 2020 07:45:59 +0000 (UTC) (envelope-from mat@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 4B68Zb3DgPz47W0 for ; Wed, 15 Jul 2020 07:45:59 +0000 (UTC) (envelope-from mat@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 63C8E35CF61; Wed, 15 Jul 2020 07:45:59 +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 635EB35D093 for ; Wed, 15 Jul 2020 07:45:59 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B68Zb1gMbz47YX; Wed, 15 Jul 2020 07:45:59 +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 "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id E879D21084; Wed, 15 Jul 2020 07:45:58 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (aching.in.mat.cc [IPv6:2a01:678:42:0:5e80:b6ff:fe2c:99e4]) (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 E8DBF942D81; Wed, 15 Jul 2020 07:45:55 +0000 (UTC) Date: Wed, 15 Jul 2020 09:45:54 +0200 From: Mathieu Arnold To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= Cc: Warner Losh , Rene Ladan , git@freebsd.org, mat@freebsd.org Subject: Re: ports 2020Q3 branch not present? Message-ID: <20200715074554.gwtj37sbcagjqcor@aching.in.mat.cc> References: <20200710212416.GA89164@freefall.freebsd.org> <20200711093659.GA16439@acme.spoerlein.net> <20200711205804.GA22050@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xr3z4kxrctvbgtdu" Content-Disposition: inline In-Reply-To: X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 15 Jul 2020 07:45:59 -0000 --xr3z4kxrctvbgtdu Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jul 12, 2020 at 04:14:43PM +0200, Ulrich Sp=F6rlein wrote: > On Sun, Jul 12, 2020 at 6:35 AM Warner Losh wrote: >=20 > > On Sat, Jul 11, 2020 at 2:58 PM Rene Ladan wrote: > > > >> Hmm, so currently the quarterly (and older releng) branches are direct= ly > >> under > >> the "remotes" origin, just like master itself. This makes switching > >> between > >> branches easy, which comes in handy for MFHs I think. > >> > > > > They are just like the stable branches in the src tree (or somewhat > > similar), so I think they should be the same, and pulled by default. Wh= ile > > they are quarterly, the traffic on them is smaller than a typical stable > > branch in src, so it's not a huge amount of extra revisions. > > > > The only way to find the size is to pull with and without them and obse= rve > > the difference. > > > > > portmgr should weigh in on where these branches should end up. Currently > I'm dumping them in refs/heads/20xxQy (not pushed yet, needs a fix), > because having them called refs/heads/branches/2020Q1 is a bit weird as t= he > "branches" is rather redundant. My svn-remote config sections has: [svn-remote "svn"] rewriteRoot =3D https://svn.freebsd.org/ports url =3D svn+ssh://repo.freebsd.org/ports pushurl =3D svn+ssh://repo.freebsd.org/ports fetch =3D head:refs/remotes/origin/trunk fetch =3D svnadmin:refs/remotes/origin/svnadmin branches =3D branches/*:refs/remotes/origin/* branches =3D projects/*:refs/remotes/origin/projects/* tags =3D tags/*:refs/remotes/origin/tags/* So I would say that anything in branches/* should end up in refs/heads/* directly yes. --=20 Mathieu Arnold --xr3z4kxrctvbgtdu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl8OtC5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgJcXRAAoQl+Tu/mSjPKeKn38QUdTjQuALhVMQTh3JkUWjsOgsDYEMyT0rJeezYF azZD+kF7f648bbfXWmSivqbEvbcqFs152ZkgDxYcA3UOB9N2Lk8B22G0QVr59Ogi nh2pzpi6/EiDyAuLBDC+T7o0iRcLyp+AFY1D8A7tBCJuUWCGGDJFFnl8FgU9DOr4 q6rNfa6YflyEKb0WXCzIhv9aldO/fvdKhD9yx0YuhnigtM00L8tv4+J3XgQjhLv9 CAXE0x7yrMQC/4UavloqvBgtCHRegSPBsNletBEcPadD/U4OLBAuQSKRZw00plbu MwWs8WO8cc2inT3GfINe1Cvx5h5YSSxAj9ZfB8yCvSK4zqolC1t+BfgpC0hdTH5M k9uQNh1PEEHur+VMAuSRPBkcPDrM/7fwkeZxuC6Yty1h7UiJw+d5cOIxAjgz2IbY SwDZgqhTGLaMyGBxPKyXx4xzjwEpFLxcLpmGC0cfdnUUSamV/f9KHg4JAv7WsrTr eJ5J8G73LZi9E/CXYvIQBnk1V1OworzlZ84iA4kqaDIb00mLDhPYQWGaeYBhzSNM T1efkzl3BDelXxptVPTAMuoHKz9VhVpxgr62dzHx5tUMkWW0OzKO75IfnAKKRTFv Ev8fQfskwv5uDdS78yoVYLnX3DoxEzlMLpkq5RwgOQo9NDvVWMo= =nyDb -----END PGP SIGNATURE----- --xr3z4kxrctvbgtdu--