Date: Wed, 15 Jul 2020 09:45:54 +0200 From: Mathieu Arnold <mat@freebsd.org> To: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, Rene Ladan <rene@freebsd.org>, git@freebsd.org, mat@freebsd.org Subject: Re: ports 2020Q3 branch not present? Message-ID: <20200715074554.gwtj37sbcagjqcor@aching.in.mat.cc> In-Reply-To: <CAJ9axoRRNm9y5Ws-2dWmr=%2BGiH3ZM0tV=mxe0Sj%2B9Sw8dBr9zA@mail.gmail.com> References: <20200710212416.GA89164@freefall.freebsd.org> <20200711093659.GA16439@acme.spoerlein.net> <20200711205804.GA22050@freefall.freebsd.org> <CANCZdfr843KeRyYNgiLDDskEanS=8%2Bj6cUWPXY6gJP_Rx_zk5g@mail.gmail.com> <CAJ9axoRRNm9y5Ws-2dWmr=%2BGiH3ZM0tV=mxe0Sj%2B9Sw8dBr9zA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <imp@bsdimp.com> wrote:
>=20
> > On Sat, Jul 11, 2020 at 2:58 PM Rene Ladan <rene@freebsd.org> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200715074554.gwtj37sbcagjqcor>