From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8DwZAPbftl9rRgAA0tVLHw (envelope-from ) for ; Thu, 19 Nov 2020 21:13:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aN97N/Xftl9YfgAAB5/wlQ (envelope-from ) for ; Thu, 19 Nov 2020 21:13:25 +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 BBF9F940341 for ; Thu, 19 Nov 2020 21:13:25 +0000 (UTC) Received: from localhost ([::1]:54392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfrF6-0007zu-Jj for larch@yhetil.org; Thu, 19 Nov 2020 16:13:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfrDS-0006qn-MO for guix-devel@gnu.org; Thu, 19 Nov 2020 16:11:42 -0500 Received: from sender4-of-o51.zoho.com ([136.143.188.51]:21154) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfrDQ-0005Jk-RC; Thu, 19 Nov 2020 16:11:42 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1605820295; cv=none; d=zohomail.com; s=zohoarc; b=mAbBJM556L9SE1Lnjm0XruZA5z0l6EJQdEfEBmdLWDaINiHsf8Wj5mJQXlTpSs0ZGagg5EKQjS+xqNyMSBa+hXlFWkvg1e02Ge6aCWG7kAgLUtGfXb9NvtbsfhMyJixjUpcgaQCBkCkVjMkRCPXguihialDj9oT8kxWWjnIL5RM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605820295; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=pdelo36+HM0D/ucVm+EFase5otQ33+7I1vA8GRIAbwI=; b=ihd6Ub197zfT6xRFyhXUBB2PltWVSlbHo88oRtgOdm4xXtw6LLlWGGnzi3XOAErxJ90Tk4kTZJNjyDhxtiD5owlK37k+3WnRZfvM6dCa+B5t6xoJRsFZ36BgyJt+5LWqGQwHKhLbaEQmrX8px2z/K7I4D/7Pzw5/dnoiF5p2qc4= 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=1605820295; 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=pdelo36+HM0D/ucVm+EFase5otQ33+7I1vA8GRIAbwI=; b=gagdYffgpYyNlftUcdYf4IrtgihvtjVaY1oopCWD95t23PnlDFjwaHOVKX8NOiZA ia1XVN5IdnfOCKv2R6QN4JDyh10qmp2ZSphYRPmVhNxamLcnAdBHhV9Zgi3yc2+mgXw AxblgJTPawt0H/MgzySnbW9tQhKweJYFIPy+NGc8= Received: from localhost (p54ad4f11.dip0.t-ipconnect.de [84.173.79.17]) by mx.zohomail.com with SMTPS id 1605820294427847.9275195022127; Thu, 19 Nov 2020 13:11:34 -0800 (PST) References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.camel@gnu.org> <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> 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: Thu, 19 Nov 2020 22:13:33 +0100 Message-ID: <873615aw3m.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: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 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_BL_SPAMCOP_NET=1.347, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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=gagdYffg; 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: ErJRqna3Pwe6 Hi, >> > http://logs.guix.gnu.org/guix/2020-11-19.log#182349 > >> Right, so I shouldn't have pushed to "wip-r" in the first place. > > Well, I think it is a lack of synchronisation between all of 3; > especially with this work around via external GitHub upstream. Yeah, sorry. I didn=E2=80=99t realize wip-r was worked on by any one other= than simon and myself. The commits are still there, they just don=E2=80=99t hav= e a named pointer (=3D branch) to them any longer: https://git.savannah.gnu.org/cgit/guix.git/log/?id=3D8ed6a08a998d4abd58eb67= c85699f38f87f76d05 If that=E2=80=99s the last commit (or if you have another one that was push= ed) I can simply reset the branch pointer to it and then stay out of it :) > >> Perhaps I should do it "the old way" and base my patches on the master >> branch and send the gazillion patches to the mailing list. :) > > What Ricardo did previously (my rewrite of history on Nov. 10 on > GitHub, and then pushed by Ricardo to Savannah today), quoting their > word: "delete origin/wip-r, reset my local copy to zimoun/wip-r, > rebased on top of origin/master, and pushed origin/wip-r". Maybe you > could do the same. > > Or if you have the super power to do that: you can delete the branch > and re-push. Deleting the branch is =E2=80=9Cgit push -d origin wip-r=E2=80=9D. >> Then we can discuss each line of the commit messages separately before >> pushing to the master branch. > > Well, I do not know what Ricardo thinks, but personally I would prefer > first a wip-r branch then merge. It will avoid avoid annoyance of > possible broken packages, I mean we could detect them. Same. I prefer having a branch so ci.guix.gnu.org can build things and we can keep an eye on the fall-out (if any). Sorry again for making this harder than it should be! --=20 Ricardo