From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: 01/01: gnu: cmake: Delete Emacs library. Date: Sat, 26 May 2018 15:37:02 +0200 Message-ID: <87y3g6edxd.fsf@fastmail.com> References: <20180522141738.8231.26687@vcs0.savannah.gnu.org> <20180522141741.641D120711@vcs0.savannah.gnu.org> <87d0xn7cqt.fsf@netris.org> <87y3ga9wty.fsf@gmail.com> <87sh6h6dk7.fsf@netris.org> <87k1rsxdbg.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMZNn-0000fR-B2 for guix-devel@gnu.org; Sat, 26 May 2018 09:37:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMZNk-00015I-2t for guix-devel@gnu.org; Sat, 26 May 2018 09:37:19 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58831) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fMZNj-000150-RT for guix-devel@gnu.org; Sat, 26 May 2018 09:37:16 -0400 In-Reply-To: <87k1rsxdbg.fsf@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Oleg Pykhalov , Mark H Weaver Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Oleg Pykhalov writes: > Hello Mark, > > Thank you for explanation of procedure and macro specifications. > I've pushed ffd526e61ab1b45c6c913ab4e139193e4d5bee9b with a fix. > > Also, here is a patch to mention core-updates-next in the documentation. > > diff --git a/doc/contributing.texi b/doc/contributing.texi > index 2792fe2b2..1c33430aa 100644 > --- a/doc/contributing.texi > +++ b/doc/contributing.texi > @@ -410,7 +410,8 @@ to be merged in @code{master} every 3 weeks or so. Topical changes > @item more than 1,200 dependent packages > @code{core-updates} branch (may include major and potentially disruptive > changes). This branch is intended to be merged in @code{master} every > -2.5 months or so. > +2.5 months or so. Also during official frozen period commits should go > +to @code{core-updates-next}. > @end table Good idea. It would be good to clarify that this also applies for 'staging'. What do you think about this instead? --=-=-= Content-Type: text/x-patch Content-Disposition: inline 1 file changed, 9 insertions(+), 2 deletions(-) doc/contributing.texi | 11 +++++++++-- modified doc/contributing.texi @@ -413,12 +413,19 @@ changes). This branch is intended to be merged in @code{master} every 2.5 months or so. @end table -All these branches are tracked by our build farm -and merged into @code{master} once +All these branches are @uref{https://hydra.gnu.org/project/gnu, +tracked by our build farm} and merged into @code{master} once everything has been successfully built. This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available. +Generally, branches other than @code{master} are considered +@emph{frozen} if there has been a recent evaluation, or there is a +corresponding @code{-next} branch. Please ask on the mailing list or +IRC if unsure where to place a patch. +@c TODO: It would be good with badges on the website that tracks these +@c branches. Or maybe even a status page. + @item @cindex determinism, of build processes @cindex reproducible builds, checking [back] --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlsJYv4ACgkQoqBt8qM6 VPpr3Af+Jp/WVmd12r7W0lZa2cnaXZsOyPdSGAKNHGZKRD8KLdtJmFZdP0qWEzvc 2jViETzj3B+KUT6STBp9YTbCj4GL0w6kqvkzhrhoRvw/XAb9qsneroEZljmkj95z oHPNnrhXPzArN+eHodIF+pxVbMVlGiuPv44vDwYMYNK5mjTQmXt0CcsSIMvqRH7N iy+/PtXpgoqeSCyxidGcuaRpjtK58AMw4pQEy+qIMTaEVudgfwv3cCcmZ0LX2aOU MBjTOALa7+EW2KNnzXqcJ4cBmtgG9G1+zGFviSK1bikQr32i/B5ZHM1jIyvy7bh+ b1VOklD3j1nACTV/uEh/16EetL/hXg== =UHoH -----END PGP SIGNATURE----- --==-=-=--