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 KB3PMR7St1+1YQAA0tVLHw (envelope-from ) for ; Fri, 20 Nov 2020 14:26:38 +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 gJSuLR7St1+dBAAAbx9fmQ (envelope-from ) for ; Fri, 20 Nov 2020 14:26:38 +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 44707940482 for ; Fri, 20 Nov 2020 14:26:38 +0000 (UTC) Received: from localhost ([::1]:35838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg7Mz-0008EO-1V for larch@yhetil.org; Fri, 20 Nov 2020 09:26:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg7Mn-0008EG-C7 for guix-devel@gnu.org; Fri, 20 Nov 2020 09:26:25 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21150) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg7Mk-0006lr-6i; Fri, 20 Nov 2020 09:26:25 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1605882379; cv=none; d=zohomail.com; s=zohoarc; b=Y8ZvsPJyGwkWxxV9MNeB7dcHpYVmO3yc7JHI7/kGgzpjMANAzebW0fXcyJhGun84zBvCsAMIdj4EOL48YvnRp40jhFzD9bzpcWx4sPMCWNZWKtUrxf5WTpprofmm/ktDiNVJ3vfVeJ3KqMV5kKbKoVk8hHmRS8vr7zloG9g2S70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605882379; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=3NtHd3PFgcdQph7if8jsSVjYmfb3FLFR6dQuB2OP3fI=; b=GbFwDl34WlTNBI805Ca1UXZm0odSTD8mRooPUK3k+iHrPXx8UnmHx58HfPljqLl0Da0RCPG9/lNoUi13jurH3NCycRzjZof1onxBa8hcx4LUA8eqwEc3BQfDkD1yjmyODz5XSxtv/eEWaYezUyu8UIK2kh5Q8P4vhVhuGHZYxp4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1605882379; s=zoho; d=elephly.net; i=rekado@elephly.net; h=References:From:To:Cc:Subject:In-reply-to:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding; bh=3NtHd3PFgcdQph7if8jsSVjYmfb3FLFR6dQuB2OP3fI=; b=Z/gqu4YjgtWQgqFjjoO0rWhl+hIwsV0VScRnpvs2lEkmAagHn6JgPaJRG2QdbMcm LBwQCRvDFOGIrWoYGUW1GG5SKOu/z9reZ+cguZlI03ezsd7QGLnYlGtK4uDsWwnI/at wHRWqDh9EvawTbSFigq3XiTplM5V1NRPV68O5AT4= Received: from localhost (p54ad4f27.dip0.t-ipconnect.de [84.173.79.39]) by mx.zohomail.com with SMTPS id 1605882377863215.22479493184062; Fri, 20 Nov 2020 06:26:17 -0800 (PST) References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.camel@gnu.org> <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> <873615aw3m.fsf@elephly.net> <63ba88365933ab9878eaa040ee4190ffdebbc41a.camel@gnu.org> <87zh3c9mgh.fsf@elephly.net> User-agent: mu4e 1.4.13; emacs 27.1 From: Ricardo Wurmus To: zimoun Subject: Re: Updating to latest Bioconductor release In-reply-to: X-URL: https://elephly.net X-PGP-Key: https://elephly.net/rekado.pubkey X-PGP-Fingerprint: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC Date: Fri, 20 Nov 2020 15:28:17 +0100 Message-ID: <87r1oo9k72.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.51; envelope-from=rekado@elephly.net; helo=sender4-of-o51.zoho.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guix Devel Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=elephly.net header.s=zoho header.b=Z/gqu4Yj; arc=reject (signature check failed: fail, {[1] = sig:zohomail.com:reject}); dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: 1.99 X-TUID: d7aLRz10u97R zimoun writes: > (You mean wip-r, right?) Oof, yes, of course :) >> Many of the commit messages were incomplete (didn=E2=80=99t mention all = changed >> inputs) and used the wrong heading =E2=80=9Cgnu: Update r-foo to 1.2.3.= =E2=80=9D instead >> of the more greppable =E2=80=9Cgnu: r-foo: Update to 1.2.3.=E2=80=9D. > > Just to understand for the next time: when should the commit upgrading > the %bioconductor-version be done? First one or last one? > > (I am speaking of this kind of commit: ac6a55e68a6ed675a55abc5339f7766136= 48cb9d) It doesn=E2=80=99t really matter; usually I do this first, so that for all following commits the fallback URL is going to be the correct new URL. I haven=E2=80=99t thought much about this, so there may be reasons involving =E2=80=9Cguix time-machine=E2=80=9D that are for or against that position. It should, in my opinion, be done together with the other change to the version string. >> I also saw that r-rsubread fails to build. > > That's the thing where I do not understand the concept of WIP branch > if it is not possible to rewrite history. > > Only one commit should do the fix. now > e57bf84eb80d6ad23710f2cad3d4fdb44ce1aca5 updates but fails. How to > proceed without adding another commit ending to master? Is the fix > added to wip-r and then before rebase to master, do the local rebase > (with reorder and squash) and push? I am sorry if my question about > the Git workflow is naive, I am not used to work such way. :-) We can and should rewrite history in the wip-r branch. So if you have a fix you can add a new commit on top of wip-r branch and mark it so that someone later can reorder and squash it before the merge into the master branch. To avoid stepping on each other=E2=80=99s toes we should be adding commits = to the top and then agree on a freeze to reorder and squash those commits in the end. --=20 Ricardo