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 GObTAJ4f7V4qXAAA0tVLHw (envelope-from ) for ; Fri, 19 Jun 2020 20:27:10 +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 8CREOJ0f7V4uPwAA1q6Kng (envelope-from ) for ; Fri, 19 Jun 2020 20:27:09 +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 919929402D1 for ; Fri, 19 Jun 2020 20:27:09 +0000 (UTC) Received: from localhost ([::1]:54112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmNbQ-0003ij-Gs for larch@yhetil.org; Fri, 19 Jun 2020 16:27:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmNbL-0003fc-FW for guix-patches@gnu.org; Fri, 19 Jun 2020 16:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmNbL-0004FU-69 for guix-patches@gnu.org; Fri, 19 Jun 2020 16:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmNbL-0001vz-2n for guix-patches@gnu.org; Fri, 19 Jun 2020 16:27:03 -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: Fri, 19 Jun 2020 20:27:03 +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.15925983987326 (code B ref 41882); Fri, 19 Jun 2020 20:27:03 +0000 Received: (at 41882) by debbugs.gnu.org; 19 Jun 2020 20:26:38 +0000 Received: from localhost ([127.0.0.1]:56860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNaw-0001u6-2e for submit@debbugs.gnu.org; Fri, 19 Jun 2020 16:26:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmNaq-0001tq-TV for 41882@debbugs.gnu.org; Fri, 19 Jun 2020 16:26:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55251) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmNal-00047J-31; Fri, 19 Jun 2020 16:26:27 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39222 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jmNak-0005Dn-1u; Fri, 19 Jun 2020 16:26:26 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200615210343.18964-1-kuba@kadziolka.net> <87lfkmrqi7.fsf@gnu.org> <20200618235213.utb3sk6la7mmhqsx@gravity> <875zbnijax.fsf@gnu.org> <20200619122528.qt3dkxk5nsu6oasc@gravity> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 2 Messidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 19 Jun 2020 22:26:22 +0200 In-Reply-To: <20200619122528.qt3dkxk5nsu6oasc@gravity> ("Jakub \=\?utf-8\?B\?S8SFZHppb8WCa2EiJ3M\=\?\= message of "Fri, 19 Jun 2020 14:25:28 +0200") Message-ID: <87sgeqg5u9.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: khTkpJhNKU0G Hi, Jakub K=C4=85dzio=C5=82ka skribis: > On Fri, Jun 19, 2020 at 09:52:38AM +0200, Ludovic Court=C3=A8s wrote: >> How would it affect your workflow if you used merges instead of >> rebasing? > > The fundamental difference would be that each merge increases the > complexity of the branch, and as such, has a cost. Sometimes, I get > some merge conflicts; in such a case I want to prepare a new patch that > applies cleanly onto master, such that I can push it easily when the > time is right. > > Also, the workflow of rebasing a patchstack allows me to clearly see > which patches are yet to be upstreamed. A history with merges - not so > much. Yeah, agreed. I do ./pre-inst-env for my local branches but I understand one might prefer to use =E2=80=98guix pull=E2=80=99. Hmm dunno, I think this needs more thought. >> With authentication now in place, you probably have to do >> this anyway, or to also disable it. > > I have configured git to sign all my commits, so it re-signs all the > patches I apply each time I rebase. I admit, this only works because I > have access to the repository itself, and as such, my key is authorized. OK. Thanks, Ludo=E2=80=99.