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 8IUIJ6yctl+RZAAA0tVLHw (envelope-from ) for ; Thu, 19 Nov 2020 16:26:20 +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 END3Iqyctl9lZwAA1q6Kng (envelope-from ) for ; Thu, 19 Nov 2020 16:26:20 +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 5F40B9404FE for ; Thu, 19 Nov 2020 16:26:20 +0000 (UTC) Received: from localhost ([::1]:34138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfmlH-00082I-50 for larch@yhetil.org; Thu, 19 Nov 2020 11:26:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfmki-000818-9S for guix-devel@gnu.org; Thu, 19 Nov 2020 11:25:44 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55796) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfmkh-0000mq-R0; Thu, 19 Nov 2020 11:25:43 -0500 Received: from [143.121.239.13] (port=58778 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 1kfmkh-0006k4-4U; Thu, 19 Nov 2020 11:25:43 -0500 Message-ID: <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> Subject: Re: Updating to latest Bioconductor release From: Roel Janssen To: zimoun Date: Thu, 19 Nov 2020 17:25:41 +0100 In-Reply-To: References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.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: jZjK1bsxaWjH On Thu, 2020-11-19 at 17:18 +0100, zimoun wrote: > On Thu, 19 Nov 2020 at 16:57, Roel Janssen wrote: > > > My bad, I jumped to a conclusion too quickly. :) > > No worries. :-) > > > > So, *something* removed my commits to the wip-r branch. Is it some > > kind > > of automation that syncs the Github and the Savannah branches? > > Which upstream? > I have no access on Savannah.  And I think you could should there. > My wip-r branch on my personal GitHub account, no automation.  > Ricardo > did couple of days ago: fetch my branch and push it to Savannah.  > Then > they reported a tiny mistake that I corrected on my branch, by > rewriting the history since it is WIP.  It was before you have > started > to work on, I guess. > > To be concrete, the last commit on my branch is 9 days ago.  And the > last commit on Savannah wip-r is 30th Otc. Yeah, because mine got removed. > > The good news is that in my local checkout I've fixed the build > > problem > > with r-rhdf5lib, so I should be able to build the remaining > > packages > > this evening. > > Really cool!  Thank you. > > > > I am hesitant to push it to the "wip-r" branch, because it seems > > pointless. :)  So where can I push my updates to? > > Please push your changes to wip-r on Savannah, rewriting the history > is fine with me.  Then Cuirass will rebuild everything, check.  Then > we can merge to master. Well, they got removed from Savannah. Now I get this when I try to push: $ 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. Kind regards, Roel Janssen