From owner-freebsd-ports@freebsd.org Fri Mar 3 10:09:20 2017 Return-Path: Delivered-To: freebsd-ports@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0BD39CF5DF2 for ; Fri, 3 Mar 2017 10:09:20 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plouf.absolight.net", Issuer "CAcert Class 3 Root" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id AAB0911ED for ; Fri, 3 Mar 2017 10:09:19 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 28295BDC89; Fri, 3 Mar 2017 11:09:18 +0100 (CET) Received: from atuin.in.mat.cc (atuin.in.mat.cc [79.143.241.205]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by prod2.absolight.net (Postfix) with ESMTPSA id 01061BDC85; Fri, 3 Mar 2017 11:09:17 +0100 (CET) Subject: Re: Using Quarterly Ports Branches To: Chris Wells , freebsd-ports@freebsd.org References: From: Mathieu Arnold Organization: Absolight / The FreeBSD Foundation Message-ID: <1801a9f5-48c1-0b24-0436-84dad8d6594a@FreeBSD.org> Date: Fri, 3 Mar 2017 11:09:15 +0100 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="jaV9VrEWUHHvmWibf7UcLqkwEIG9IaQfe" X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Mar 2017 10:09:20 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --jaV9VrEWUHHvmWibf7UcLqkwEIG9IaQfe Content-Type: multipart/mixed; boundary="B9lUD5wtWdjGLg7v9DVG65CXSUtxxbRwq"; protected-headers="v1" From: Mathieu Arnold To: Chris Wells , freebsd-ports@freebsd.org Message-ID: <1801a9f5-48c1-0b24-0436-84dad8d6594a@FreeBSD.org> Subject: Re: Using Quarterly Ports Branches References: In-Reply-To: --B9lUD5wtWdjGLg7v9DVG65CXSUtxxbRwq Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 03/03/2017 =C3=A0 05:01, Chris Wells a =C3=A9crit : > A few questions: If I switch from HEAD to a quarterly ports branch, > should I "rm -r /usr/ports/*" before checking out the quarterly branch > from SVN? If so, should I do the same every time I migrate to a newer > branch (e.g., moving from 2017Q1 to 2017Q2)? I believe it makes sense > when reverting to an older branch like HEAD to quarterly, but I'm > hoping it's unnecessary when moving forward. Any other directories > that should be cleaned for a first-time change to quarterly ports or > subsequent quarterly migrations? Mmm, if you are using svn, I do not think you ever need to remove /usr/ports: $ svn co https://svn.freebsd.org/ports/head ports [blah] $ cd ports $ svn info|grep URL URL : https://svn.freebsd.org/ports/head Relative URL: ^/head $ svn switch ^/branches/2016Q4 [blah] $ svn info|grep URL URL : https://svn.freebsd.org/ports/branches/2016Q4 Relative URL: ^/branches/2016Q4 $ svn switch ^/branches/2017Q1 [blah] $ svn info|grep URL URL : https://svn.freebsd.org/ports/branches/2017Q1 Relative URL: ^/branches/2017Q1 For svn switch to really work, you do have to make sure you did not change files in the ports tree. > Would it be possible to "simply" create a symlink at > https://svn.freebsd.org/ports/branches/quarterly that always points to > whatever the current quarterly branch is? That way, everyone who wants > to use quarterly packages/ports wouldn't have to worry about > constantly switching the ports branch on every system they manage. A > side benefit would be that packages and ports can share the > terminology and meaning for their quarterly branch. Bonus points: > change pkg and ports to have a CURRENT symlink pointed to HEAD and a > STABLE symlink pointed to the latest quarterly branch so the names are > more in sync with the base system's branch names. Currently, all our tools working automatically with the quarterly branches do this before any run: latest_branch=3D$(svn ls https://svn.freebsd.org/ports/branches/|sed -ne '/^2.*Q./s|/$||p'|tail -1) All you'd need to do before running svn update would be to run: svn switch ^/branches/$(svn ls https://svn.freebsd.org/ports/branches/|sed -ne '/^2.*Q./s|/$||p'|tail -1= ) and it would automagically switch to the new branch when a new branch happens. > If the symlink would work and easy enough to manage, it would be a > great portsnap default in the base system to match pkg. The icing on > the cake would be a persistent local setting to tell portsnap what > branch to use so the commands to fetch/update the ports tree are > consistent whether using HEAD or a branch. The problems with symbolic links, is that they do not work on all filesystems. --=20 Mathieu Arnold --B9lUD5wtWdjGLg7v9DVG65CXSUtxxbRwq-- --jaV9VrEWUHHvmWibf7UcLqkwEIG9IaQfe Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJYuUDNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IFi0P/3Q+qUZ0tWspakpmqpRHlkkc zPSG9xjSIHR4CkxUyH709cHOxBv614YwxApvVO3IdkwLpD2kRiD6GA/mTR9zIbC0 BDwmzVhVlItaXPppyJqiECXWHOcvpvMmruey5f5l4VTqIxoLIaJEdtNiL4w+e+Qg kJtZiWryU6Sn45t2eA4M0laJFbvGLCKalOMKEjrPj+r7C0E4TlfZ6oNXtbKDctrX NyCiPJC2HIL70iHezV+ylT4HD2SoDozhAvsGkK7TrOw9/QZBuCAeAE1iH6Qts9D4 fI6r4zmakL5tRF7m7Hf52ouW4laZZZSVPfQp+CYj7XFpx7+oNC966MvkfUJ/jLuT Q9bpWuDQAVMPvdGdn/oo3o3gaQg3BeTh6JWXMNLi6JBEzDnhiqL3MwztLtRdTg6D QZQzBifjus0k+xvpNEJhjxG+9unTiv36Nx+vYF9+Som2Qm4HVaz4Nh1yXuqBsko4 wuQQ/LCBxrfwJTqaJqCKahV6AwNnyhHghP8NcP/Q0x2jl2rwq3rUBGM61vnBR5wn izam2LagxUYxgD8PzcojkF+mcPponevI4Da0orlhXi5VNHb9NfgtlVhSdmEGN0p+ gTUU2M3Z0gfqXIZPF24O5JVMAceOUCT21l5bjLrftb2ZM7Njf+XZ7IDtZd1BZ/U7 WzH+QoC0OeJqg0UhJb+m =4cFD -----END PGP SIGNATURE----- --jaV9VrEWUHHvmWibf7UcLqkwEIG9IaQfe--