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 0DyxI3s00l+eVgAA0tVLHw (envelope-from ) for ; Thu, 10 Dec 2020 14:45:15 +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 +HtxH3s00l8tHgAAbx9fmQ (envelope-from ) for ; Thu, 10 Dec 2020 14:45:15 +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 38DE09402B6 for ; Thu, 10 Dec 2020 14:45:15 +0000 (UTC) Received: from localhost ([::1]:50334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knNBy-0007Gr-6b for larch@yhetil.org; Thu, 10 Dec 2020 09:45:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knN34-0006sd-3T for guix-patches@gnu.org; Thu, 10 Dec 2020 09:36:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knN33-00028j-SS for guix-patches@gnu.org; Thu, 10 Dec 2020 09:36:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knN33-0005b2-PB for guix-patches@gnu.org; Thu, 10 Dec 2020 09:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#40764] New package: r-restrserve Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Dec 2020 14:36:01 +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.160761091021449 (code D ref 40764); Thu, 10 Dec 2020 14:36:01 +0000 Received: (at 40764-done) by debbugs.gnu.org; 10 Dec 2020 14:35:10 +0000 Received: from localhost ([127.0.0.1]:37305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knN2E-0005Zt-AA for submit@debbugs.gnu.org; Thu, 10 Dec 2020 09:35:10 -0500 Received: from mail-wr1-f52.google.com ([209.85.221.52]:40317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knN2A-0005ZU-VK for 40764-done@debbugs.gnu.org; Thu, 10 Dec 2020 09:35:08 -0500 Received: by mail-wr1-f52.google.com with SMTP id 91so5699531wrj.7 for <40764-done@debbugs.gnu.org>; Thu, 10 Dec 2020 06:35:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-transfer-encoding; bh=LDJZokgApkHW8V2LmJYHjLSn5HvP0JfGGEqPJiso8v8=; b=AHiihok+hey9wE5rpApNpPubl+pWAMxPWv8rEUjuGuFkj/trrz4OYpl7TYQ9I6Nq4R WqpaYFp5PRkGEUTPf+F2I5k/Ekms5vkgHxQb5sZQQr90wyymllVX8DecmwnBrhqzZckU zy/C4Hm39MsmE20gYXRFc2mj9Pq9aO5/RuuWrtCschGedUO7U+sgz6iRF1E7Clv8F1DI AGzPqzZmv/rURkMC4wKKOaMr1YkfRdIUGsfbxeASqt/gscM6M9wh60ysLEP4tHacsX8w BL75gR8Xb0628HlF/ToYYaqf13gDb8W79+oK8bbB5/uIuIXYUef4S/PHu7adr1QsadDm hwHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version:content-transfer-encoding; bh=LDJZokgApkHW8V2LmJYHjLSn5HvP0JfGGEqPJiso8v8=; b=AFg4euwqzNgq2oFeh6HEaSxBd2VTO6WKOf49HXPBUw+zPrnflTF2VmidiDcE0TZq8F 8Sg5n9LyHZjG98tRirr/cs0FIN0NCJzBz63IVTYNgKsHSv0UVAxocB08a4JhYfThExFf 1F0/bqGHdnJ1yB1xrfj9HawJvnZJvZThSIdKm8PnY21k9ys/RiaSBEbOdwFmmNPXeyfC 9HLzB/yVvSFjHtNzFlzOKci19Zkgq21myuHNiejVODIqVg34047uOd6ojpbQoaOKdj3t gX3iEBJVxLXV63qiAluDHJnqD63yctyLbh3sq8C6muMpL6TW/bhnwbBXniUfaRyMdSVt Rauw== X-Gm-Message-State: AOAM531/CyjY3j+3FgzSTkcGD8w+QkWLrT/VlGCGvzRHsb0aQ9IyLrKn +VZmyli06v6tC2cPLPxQ6qBUN+GUSuo= X-Google-Smtp-Source: ABdhPJx0JQmHqTDE4G9EcRevkKQHbeQr0vhx6B10hxG2SiH+DVx2/mpGmdim8SVstbVP1ktzXZeS8A== X-Received: by 2002:a5d:44cf:: with SMTP id z15mr8534385wrr.205.1607610900850; Thu, 10 Dec 2020 06:35:00 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id b73sm10178657wmb.0.2020.12.10.06.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 06:35:00 -0800 (PST) From: zimoun In-Reply-To: <87pn3hlrz0.fsf@elephly.net> References: <87pnbzpyeq.fsf@ericcbrown.com> <87mtym4vri.fsf@cbaines.net> <864kktj0rx.fsf@gmail.com> <87pn3hlrz0.fsf@elephly.net> Date: Thu, 10 Dec 2020 15:25:30 +0100 Message-ID: <86sg8dhh5x.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: -1.20 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=AHiihok+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 38DE09402B6 X-Spam-Score: -1.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: NQ9hImF3+oJy Hi Ricardo, On Thu, 10 Dec 2020 at 14:18, Ricardo Wurmus wrote: >> On Wed, 09 Dec 2020 at 19:36, Christopher Baines wrot= e: >> >>> 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 conflicts >>> become very likely. Related to this, I also moved the package definition >>> 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. > > 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. [...] > 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. The option =E2=80=9Cformat-patch --base=E2=80=9D reduces the burden and I p= roposed this patch: Adding directly in the patch the (base) commit where the patch is known to apply fixes most of the issues. IMO. All the best, simon