From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd2Py-000242-K2 for guix-patches@gnu.org; Wed, 02 Aug 2017 18:47:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dd2Pv-0007tG-Dn for guix-patches@gnu.org; Wed, 02 Aug 2017 18:47:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36418) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dd2Pv-0007tB-9w for guix-patches@gnu.org; Wed, 02 Aug 2017 18:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dd2Pv-0000dk-4T for guix-patches@gnu.org; Wed, 02 Aug 2017 18:47:03 -0400 Subject: [bug#27898] [PATCH 1/2] gnu: Use 'modify-phases' syntax. Resent-Message-ID: Date: Wed, 2 Aug 2017 18:46:14 -0400 From: Leo Famulari Message-ID: <20170802224614.GC14798@jasmine.lan> References: <871sov69jq.fsf@openmailbox.org> <20170801072153.19077-1-kei@openmailbox.org> <87mv7hwzqu.fsf@fastmail.com> <20170802194148.GB13105@jasmine.lan> <87fud9wx59.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="s9fJI615cBHmzTOP" Content-Disposition: inline In-Reply-To: <87fud9wx59.fsf@fastmail.com> 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: Marius Bakke Cc: Kei Kebreau , 27898@debbugs.gnu.org --s9fJI615cBHmzTOP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 more > > 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) relatively > > opaque when reading the Git history. Marius's suggestion is another good > > 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 don't really have a strong opinion either way. But I'd hate to the one > resolving potentially 100s of merge conflicts at once ;-) Cherry-picking > at least restricts the set of conflicts to these changes. OTOH, if Kei doesn't have an unsquashed version of this patch, it will be annoying to split it up :) --s9fJI615cBHmzTOP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlmCVjYACgkQJkb6MLrK fwghZA//SJ1poCCy9h0YgxDzAsJbDQJEltUX079JbqwB34EZRRFImAWVVnsaE6OQ L/mZU3ZOTrxaJGqPAmhneVZCp4B8SuPa/ouXTQ1LGdMFK2+Y0IBOJSsLAVUo06/D I5LqQR2A63fVnyhiTNhvigVeBW+aFAs5lNMenBSsk1vorqaD7724UXp9stKH5LWL z9hM2CpDx4A1EQKFr+WbY9ugxfxw9DnpIJCTUUSFvxdzlt4E1SG0ElL4k50yWls3 oYqT4gs5RQgfnOQpCDr090EvnbA03HwRiuU4NwGn5XoToJaeGp0m4RIYqeDOPUjI 8EIjrnr0th9gfYvV/mreo1FvtLH7BmOP719+kVbxb+5l6LvkLF6roKSymAR2x7ON 4AxxDJbTIuBLULSM5V+oFjX7oo7YDh73crQcKRHClCzBEYFE7/CDMOFiVIhW10h9 Ta6dKyY47c6SRo43RKLC13HPj06G73F1+qexRUzYnT7pJuicJmZrlE4nZ1AiI98T B8UlsO+6IEv1Y5aXQAdwwuAMnWr9V9aKKLzx4Q3Qe0+Z4vMCmRA7ZgTtuXr2PPbf xE+t96Pgz/6jE370sjKghyu6MOlJaNw5nChnQN6mHmoEoFI4LnDYjpIuS3GaquRa clPxHN32JaR6ztIg1MZXpGfLAuZkYidw4LiGWCs7nAXK6dcbi1Y= =rICT -----END PGP SIGNATURE----- --s9fJI615cBHmzTOP--