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 cL6YJCfFtl8mPAAA0tVLHw (envelope-from ) for ; Thu, 19 Nov 2020 19:19:03 +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 yP6VICfFtl8bYgAA1q6Kng (envelope-from ) for ; Thu, 19 Nov 2020 19:19:03 +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 49AE49402C8 for ; Thu, 19 Nov 2020 19:19:03 +0000 (UTC) Received: from localhost ([::1]:37786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfpSQ-0007nf-44 for larch@yhetil.org; Thu, 19 Nov 2020 14:19:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfpRt-0007nY-E0 for guix-devel@gnu.org; Thu, 19 Nov 2020 14:18:29 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:33237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfpRr-00053m-ML; Thu, 19 Nov 2020 14:18:29 -0500 Received: by mail-qt1-x82a.google.com with SMTP id i12so5274246qtj.0; Thu, 19 Nov 2020 11:18:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=OmW4d92Dp845VyIVdmr4iNpt5tLYrDJ1HmO2TaYAj8k=; b=MsS2dlo+hRCirRQOuzBv3KhDcQoncUV+8mfBaWuC79hiJMuaoEkJkjAE9DUqi4D8xs /I7WsUAHiRgbRE97PybdlteP4CLZQZ2uGRU+WjIlRDjSK8W94d5GP2/umQaPmaQaoVPJ j6TK6iVQqpmOw6sljJ+XLmzhqRiFROgWMhHg/Avwy4IibJtcZXOGigC+Om9CfsxoIKom HWl4mNyABXQ9v2aUYRWHhMiD+eIWWaxQ+kNOsshTqFHKwk02EMBOK6skcqcY1iLu8q2a fa2wFHpY46vwDrFk1HmAjUta3w2/Z8ZK0yokwHF5KIbxU1q/MVb4wXwqNs/r6W1uEZO0 rUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=OmW4d92Dp845VyIVdmr4iNpt5tLYrDJ1HmO2TaYAj8k=; b=F/LO7S0XQC5aUb9EBOCIwjBryVQqyVIQbGLdEpvqVhud0yYvySrLCjISGwWVmFHOqS FsYb0nsglgR/bOhw/22g0EzOOZWHw9yPfb94BF4vXx9HaLeFQy7PuUWo12LwA4rp6lxG +14TyLbhUD6Ymo6lwFcnAVL+MHuuswi6kptF7W/6CQmqHtSgt82TV6mQYx3bCsfNKPQa I432QXGJExFRJFJ2yvN0gOUgT7UZLdl/VVCFYq3YK5TkzdKWQaonE/lRJGV6ShKwMpKO b+8U8FtpNubpdzprJfkz7OVTA7V34xKsSPTlaX3/ltOce0p/lGd7lYT/QRqYof1WPu/M 8l3Q== X-Gm-Message-State: AOAM533puJP6DeOpAppYjSqxA0NfMpsdVfAQI6ejALJeMb+ftbC9rvCd hDbdQJuoeI6vAf88OPcpxbiwDZ9qW9BoB/wdOxuHJ1OLSO8= X-Google-Smtp-Source: ABdhPJzvdpOx5ZQwaS1AUJHfmVxkW58PEGWn/H6X4nQsCc5clr5okgR1r03aP/CQ7pdzP0l0vQbXhW7bhznxXxL+A2c= X-Received: by 2002:ac8:5d53:: with SMTP id g19mr12876150qtx.354.1605813506081; Thu, 19 Nov 2020 11:18:26 -0800 (PST) MIME-Version: 1.0 References: <86tutnmvyn.fsf@gmail.com> <63ad286432442f3c6c22acf60b50632d1a4d4b8d.camel@gnu.org> <0f3a95cbcbefec60a9a239f39eefa7a991272dc9.camel@gnu.org> In-Reply-To: From: zimoun Date: Thu, 19 Nov 2020 20:18:14 +0100 Message-ID: Subject: Re: Updating to latest Bioconductor release To: Roel Janssen Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=zimon.toutoune@gmail.com; helo=mail-qt1-x82a.google.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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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=gmail.com header.s=20161025 header.b=MsS2dlo+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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: 0.09 X-TUID: L8GvAvmWghF2 Hi Roel, On Thu, 19 Nov 2020 at 20:03, Roel Janssen wrote: > > 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. > 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. > 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. All the best, simon