From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd2jK-0004Zz-EM for guix-patches@gnu.org; Wed, 02 Aug 2017 19:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dd2jG-00057X-9a for guix-patches@gnu.org; Wed, 02 Aug 2017 19:07:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dd2jG-00057T-5i for guix-patches@gnu.org; Wed, 02 Aug 2017 19:07:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dd2jG-0001Jn-0T for guix-patches@gnu.org; Wed, 02 Aug 2017 19:07:02 -0400 Subject: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. Resent-Message-ID: From: Marius Bakke In-Reply-To: <8760e5wpgq.fsf@fastmail.com> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> <20170802224614.GC14798@jasmine.lan> <8760e5wpgq.fsf@fastmail.com> Date: Thu, 03 Aug 2017 01:06:05 +0200 Message-ID: <871sotwowy.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Leo Famulari Cc: Kei Kebreau , 27898@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Marius Bakke writes: > Leo Famulari writes: > >> On Wed, Aug 02, 2017 at 10:08:18PM +0200, Marius Bakke wrote: >>> Leo Famulari writes: >>> > I agree, wow! Thanks for this. It should help new Schemers to feel mo= re >>> > comfortable editing packages. >>> > >>> > This might be annoying but it should wait until after the core-updates >>> > branch is done and merged into the master branch. I want to minimize = the >>> > number of merge conflicts because they are 1) annoying and 2) relativ= ely >>> > opaque when reading the Git history. Marius's suggestion is another g= ood >>> > one, and would help with issues like that. >>> > >>> > But if we were to wait until after core-updates and push it as one >>> > commit, I wouldn't mind. It's up to the two of you and everyone else = :) >>>=20 >>> Yeah I guess the squashed patch is okay. If we delay the patches until >>> after 'staging' and 'python-updates' as well, no merge will be >>> necessary. But it won't be a pretty cherry-pick either, by then. >> >> True, we should not wait *too* long. I think that doing it after >> core-updates and before staging and python-updates could be good >> compromise, because those branches touch a relatively small number of >> modules. WDYT? > > I think the least painful path is: > > * Merge 'core-updates'. > * Merge to 'staging'. > * > * Branch 'python-updates' from staging. > * Build staging. > > Sounds good? :-) Actually we probably should swap 2 and 3 if we can take the rebuild hit on 'master'. I don't know how many rebuilds this will cause, but I guess as long as it's in the three-digit range it should not take too long. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlmCWt4ACgkQoqBt8qM6 VPpEaAgAqkCGnipI68l5jyqj4hcn7SLV7qPTH2C+146afi5gEb0zZ+pvEN8WdxLW uTwmR/FY7E2gJkxN4WrPerPQ+0k4MCJuE9ZlMnfXuUt7acI8J9qOzOEctaeA/OIC ngKQcQUZ+9FUwAVvMMCFkZflNpbzMBX811UaV+1e2/Comd3urbmX8obBmEWYIeb5 ld1LJcXY9SVv4b+x8R7mvoIXyxJE16ms8iHqIX7BZYtkSNii9TXN6MTZVth51zhj 4EmcyqUawg6FLmoSE0twgWT52O2vlj3CJ+50EMUOrefwAURKaf+/kDaHfv6lWzMs 7gn358tkQnEjNX+s9QqAmjKDiNk5QQ== =xaqA -----END PGP SIGNATURE----- --=-=-=--