From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6MANA0ww0l/BKwAA0tVLHw (envelope-from ) for ; Thu, 10 Dec 2020 14:27:24 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id WL5oOksw0l9UEgAAbx9fmQ (envelope-from ) for ; Thu, 10 Dec 2020 14:27:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8BB3C94043B for ; Thu, 10 Dec 2020 14:27:23 +0000 (UTC) Received: from localhost ([::1]:44576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knMuf-00012I-Py for larch@yhetil.org; Thu, 10 Dec 2020 09:27:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knMqU-0005H0-R0 for guix-patches@gnu.org; Thu, 10 Dec 2020 09:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knMqU-0005yH-Ik for guix-patches@gnu.org; Thu, 10 Dec 2020 09:23:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knMqU-0005Hs-CI for guix-patches@gnu.org; Thu, 10 Dec 2020 09:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40764] New package: r-restrserve Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Dec 2020 14:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40764 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ricardo Wurmus Received: via spool by 40764-done@debbugs.gnu.org id=D40764.160761013420252 (code D ref 40764); Thu, 10 Dec 2020 14:23:02 +0000 Received: (at 40764-done) by debbugs.gnu.org; 10 Dec 2020 14:22:14 +0000 Received: from localhost ([127.0.0.1]:37296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knMph-0005Ga-Oq for submit@debbugs.gnu.org; Thu, 10 Dec 2020 09:22:14 -0500 Received: from flashner.co.il ([178.62.234.194]:58354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knMpg-0005GN-2W for 40764-done@debbugs.gnu.org; Thu, 10 Dec 2020 09:22:12 -0500 Received: from localhost (unknown [31.210.180.46]) by flashner.co.il (Postfix) with ESMTPSA id 226A8404CF; Thu, 10 Dec 2020 14:22:06 +0000 (UTC) Date: Thu, 10 Dec 2020 16:22:03 +0200 From: Efraim Flashner Message-ID: References: <87pnbzpyeq.fsf@ericcbrown.com> <87mtym4vri.fsf@cbaines.net> <864kktj0rx.fsf@gmail.com> <87pn3hlrz0.fsf@elephly.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="0oLjG5Id+hDI7DEJ" Content-Disposition: inline In-Reply-To: <87pn3hlrz0.fsf@elephly.net> X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Brown , 40764-done@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -3.90 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8BB3C94043B X-Spam-Score: -3.90 X-Migadu-Scanner: scn1.migadu.com X-TUID: 8aHYdJchUzIc --0oLjG5Id+hDI7DEJ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 10, 2020 at 02:18:27PM +0100, Ricardo Wurmus wrote: >=20 > zimoun writes: >=20 > > Hi Chris, > > > > On Wed, 09 Dec 2020 at 19:36, Christopher Baines wro= te: > > > >> In the future, I'd strongly recommend not adding packages to the bottom > >> of modules, unless you really want the package definition to be > >> there. If every new definition gets added at the bottom, merge conflic= ts > >> become very likely. Related to this, I also moved the package definiti= on > >> up off the bottom of the module. > > > > What do you mean? From my understanding, we always add new R packages > > at the botton of the files cran.scm or bioconductor.scm; mainly. >=20 > The problem is 100% with tooling. Git needs some context to apply > patches. When you add package definitions to the bottom and that bottom > context keeps changing you will always need to tell Git how to apply that > patch. >=20 > By picking an arbitrary location somewhere in the file you avoid this > problem because it=E2=80=99s unlikely that other people will pick that ve= ry same > location. >=20 > > The only fix to avoid boring conflicts is to reduce the time between the > > submission and the merge, IMHO. >=20 > Not even that would be a fix, because you can have two different people > submitting patches for modifications at the bottom of the file at the > same time. Applying them one after the other will result in the same > problem, no matter how fast we are. >=20 > Of course it=E2=80=99s always better to reduce time between submission and > application. >=20 > It would be *great* if we could find another way to appease git and do > the right thing for the most common case of simply adding a package > definition to the bottom of the file, no matter what context there might > be right above. >=20 This is why I like sorting them alphabetically :) --=20 Efraim Flashner =D7=90=D7=A4=D7=A8=D7=99=D7=9D = =D7=A4=D7=9C=D7=A9=D7=A0=D7=A8 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --0oLjG5Id+hDI7DEJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAl/SLwsACgkQQarn3Mo9 g1EUXQ/9FgKNGkpDnnJx3T0jmdvy7j09l7QkCVQG1I9S3HWTJcnCt6ruzXBjMk3v S15tdwufar62cJZEvChp/mLfJLBSW4WnswMVnVHmj0Klfk2fM6FfDCy75nLI8l8K A5Q6pQZLlAmRQ1hVQM1guWTCpv9RECb2dNGYk3DvFGT3SRjrH95fkqxwK6ly1ByR Wrpmzdu9j//4DVZJBHdWz3BVO+cZdhpE1Uw+qrWx+XDxRSZ1cBnVCnZu8IL7upLC VOy01QNtkZCtBaS3cF3XMCv4qCe2G9UOHmPlF9uDV/G57xzO46H29Rm8tziGRhSQ WAekP9jRnuyYqEyXQUwnIYi9DEFhhgRymRi8R3XyWddg/z0+ZgUe8SQn51780ie8 01RMI9Aw37n9NysBqGRGyscCj6H4Tnda9cCCqch7BbfOTmhaTTabIUW2ATXgN3pW +uFHxzfCGjahcAPtOjbfq5W3+96nlNvVVYZGZ/HkKdBGrw2XU441hCRas86JCWl/ 97qosrE7pox9zRlQUf8Wn5G1aVat0BgzwbH29x7TFlAh0ScHjsSm/Aaix2IUDhnY ELOK78+uIGeSH4d3YkuC9m/GtcT0Pl6v0cT0Dud5qURdZ+UcslUdF82gVB86iIub P2s395v2ALPHiF8A7SKHG0PyKfcLaxixcjP/aCqaatlipcDiBLY= =F7RK -----END PGP SIGNATURE----- --0oLjG5Id+hDI7DEJ--