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 488rHI3Btl/GPgAA0tVLHw (envelope-from ) for ; Thu, 19 Nov 2020 19:03:41 +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 CJejF43Btl8TTAAA1q6Kng (envelope-from ) for ; Thu, 19 Nov 2020 19:03:41 +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 1D91C9404FB for ; Thu, 19 Nov 2020 19:03:40 +0000 (UTC) Received: from localhost ([::1]:49456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfpDW-0000HK-Tk for larch@yhetil.org; Thu, 19 Nov 2020 14:03:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfpD8-0000H0-91 for guix-devel@gnu.org; Thu, 19 Nov 2020 14:03:14 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59644) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfpD7-00083U-PP; Thu, 19 Nov 2020 14:03:13 -0500 Received: from 2001-1c02-0b2a-aa00-535e-258b-a1d8-1018.cable.dynamic.v6.ziggo.nl ([2001:1c02:b2a:aa00:535e:258b:a1d8:1018]:33168) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kfpD7-0002Oy-8e; Thu, 19 Nov 2020 14:03:13 -0500 Message-ID: Subject: Re: Updating to latest Bioconductor release From: Roel Janssen To: zimoun Date: Thu, 19 Nov 2020 20:03:04 +0100 In-Reply-To: References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.camel@gnu.org> <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> 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: MlkiVIedEr1v Hi Simon, On Thu, 2020-11-19 at 18:27 +0100, zimoun wrote: > Hi Roel, > > Quick heads up of Ricardo from IRC. > > On Thu, 19 Nov 2020 at 17:25, Roel Janssen wrote: > > > Well, they got removed from Savannah. Now I get this when I try to > > push: > > http://logs.guix.gnu.org/guix/2020-11-19.log#182429 > > > $ git push -f origin wip-r > > Enumerating objects: 1599, done. > > Counting objects: 100% (1599/1599), done. > > Delta compression using up to 4 threads > > Compressing objects: 100% (362/362), done. > > Writing objects: 100% (1590/1590), 359.31 KiB | 14.37 MiB/s, done. > > Total 1590 (delta 1271), reused 1545 (delta 1228), pack-reused 0 > > remote: error: denying non-fast-forward refs/heads/wip-r (you > > should > > pull first) > > To git.savannah.gnu.org:/srv/git/guix.git > >  ! [remote rejected]       wip-r -> wip-r (non-fast-forward) > > error: failed to push some refs to > > 'git.savannah.gnu.org:/srv/git/guix.git' > > > > So, that's not going to work. > > Perhaps @Ricardo knows more about the setup of the "wip-r" branch. > > http://logs.guix.gnu.org/guix/2020-11-19.log#182349 > > Hope that helps, > Right, so I shouldn't have pushed to "wip-r" in the first place. 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. :) Then we can discuss each line of the commit messages separately before pushing to the master branch. I can prepare it this evening and tomorrow evening. Kind regards, Roel Janssen