From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 2L/OLG7i6V6vPwAA0tVLHw (envelope-from ) for ; Wed, 17 Jun 2020 09:29:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 2DQlKG7i6V6aMgAAbx9fmQ (envelope-from ) for ; Wed, 17 Jun 2020 09:29:18 +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 489509400E1 for ; Wed, 17 Jun 2020 09:29:18 +0000 (UTC) Received: from localhost ([::1]:36386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlUNh-0003qg-8f for larch@yhetil.org; Wed, 17 Jun 2020 05:29:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlUNS-0003kA-V1 for guix-patches@gnu.org; Wed, 17 Jun 2020 05:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlUNS-0005wg-Lp for guix-patches@gnu.org; Wed, 17 Jun 2020 05:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlUNS-0005m2-J9 for guix-patches@gnu.org; Wed, 17 Jun 2020 05:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41882] [PATCH] channels: Allow specifying per-channel --allow-downgrades in the channel file Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Jun 2020 09:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Cc: 41882@debbugs.gnu.org Received: via spool by 41882-submit@debbugs.gnu.org id=B41882.159238608222093 (code B ref 41882); Wed, 17 Jun 2020 09:29:02 +0000 Received: (at 41882) by debbugs.gnu.org; 17 Jun 2020 09:28:02 +0000 Received: from localhost ([127.0.0.1]:50349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlUMT-0005k2-KM for submit@debbugs.gnu.org; Wed, 17 Jun 2020 05:28:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53804) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlUMQ-0005jg-NB for 41882@debbugs.gnu.org; Wed, 17 Jun 2020 05:28:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42533) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlUMK-0005gw-W8; Wed, 17 Jun 2020 05:27:53 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=40280 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jlUMF-0002qV-Ql; Wed, 17 Jun 2020 05:27:48 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200615210343.18964-1-kuba@kadziolka.net> Date: Wed, 17 Jun 2020 11:27:44 +0200 In-Reply-To: <20200615210343.18964-1-kuba@kadziolka.net> ("Jakub \=\?utf-8\?B\?S8SFZHppb8WCa2EiJ3M\=\?\= message of "Mon, 15 Jun 2020 23:03:43 +0200") Message-ID: <87lfkmrqi7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: pdT8a2Sf1OgL Hi Jakub, Jakub K=C4=85dzio=C5=82ka skribis: > * guix/channels.scm () > [allow-unrelated?, allow-downgrade?]: New fields. > (ensure-forward-channel-update): Handle the fields appropriately. > --- > guix/channels.scm | 5 +++++ > 1 file changed, 5 insertions(+) > > Some time ago, guix pull started verifying that the new commit follows > the old commit in the git history. That's good in the common case, but > unfortunately, this broke my workflow [0]. :-) > Namely, I maintain a branch of the guix repository on which I > cherry-pick some commits that haven't hit master yet. I rebase it onto > master frequently. I see; this is similar to what John reported in . > It gets tiring to have to specify --allow-downgrades when pulling, so I > added a way of specifying it in the channels file. As a bonus, it's more > granular. > > If this is the right approach, I'll add some docs. Also, is there a test > that exercises this function? I don=E2=80=99t think =E2=80=9Callow-downgrade?=E2=80=9D should be a proper= ty of , because conceptually it=E2=80=99s an unrelated piece of configuration. So I think it=E2=80=99s configuration that belongs elsewhere, but there=E2=80=99= s no configuration file for =E2=80=98guix pull=E2=80=99 etc. It may be that setting GUIX_BUILD_OPTIONS=3D--allow-downgrades actually works, though it=E2=80=99s a bit of a hack. Thoughts? Thanks, Ludo=E2=80=99.