From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YMWuJoiJt184RAAA0tVLHw (envelope-from ) for ; Fri, 20 Nov 2020 09:16:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AMOGIoiJt1+9KgAA1q6Kng (envelope-from ) for ; Fri, 20 Nov 2020 09:16:56 +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 3D4749401BC for ; Fri, 20 Nov 2020 09:16:56 +0000 (UTC) Received: from localhost ([::1]:57614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg2XH-0002jg-04 for larch@yhetil.org; Fri, 20 Nov 2020 04:16:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg2X9-0002jH-7T for guix-devel@gnu.org; Fri, 20 Nov 2020 04:16:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44207) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg2X8-0001ya-Pe; Fri, 20 Nov 2020 04:16:46 -0500 Received: from [143.121.239.14] (port=52854 helo=[10.132.152.6]) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kg2X8-0003Mu-0B; Fri, 20 Nov 2020 04:16:46 -0500 Message-ID: <63ba88365933ab9878eaa040ee4190ffdebbc41a.camel@gnu.org> Subject: Re: Updating to latest Bioconductor release From: Roel Janssen To: Ricardo Wurmus , zimoun Date: Fri, 20 Nov 2020 10:16:44 +0100 In-Reply-To: <873615aw3m.fsf@elephly.net> References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.camel@gnu.org> <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> <873615aw3m.fsf@elephly.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.1 (3.38.1-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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=none; dmarc=pass (policy=none) header.from=gnu.org; 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.51 X-TUID: dZJtPxMRdGZO On Thu, 2020-11-19 at 22:13 +0100, Ricardo Wurmus wrote: > 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’t realize wip-r was worked on by any one other than > simon and myself.  The commits are still there, they just don’t have a > named pointer (= branch) to them any longer: > > https://git.savannah.gnu.org/cgit/guix.git/log/?id=8ed6a08a998d4abd58eb67c85699f38f87f76d05 > > If that’s the last commit (or if you have another one that was pushed) I > can simply reset the branch pointer to it and then stay out of it :) > This is the most recent commit I pushed: https://git.savannah.gnu.org/cgit/guix.git/log/?id=ea92cec586893748b6de32b930117c598225c38c It'd be great if you could reset the branch pointer! :) > > > > > 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 “git push -d origin wip-r”. > > > > 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). On IRC you noted that the commit messages are wrong. I interpret that as "my commit messages are wrong", which I guess will be those where I updated the inputs of packages. Could you tell me how I need to format the commit messages? Then I can perhaps rewrite the most recent history of the wip-r branch to fix my commit messages. Kind regards, Roel Janssen