From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CKA6CeWu7F6ieAAA0tVLHw (envelope-from ) for ; Fri, 19 Jun 2020 12:26:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wMYPBeWu7F5QQgAAB5/wlQ (envelope-from ) for ; Fri, 19 Jun 2020 12:26:13 +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 A615C9400E1 for ; Fri, 19 Jun 2020 12:26:12 +0000 (UTC) Received: from localhost ([::1]:40542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jmG5y-0002F5-B2 for larch@yhetil.org; Fri, 19 Jun 2020 08:26:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jmG5q-0002Ek-As for guix-patches@gnu.org; Fri, 19 Jun 2020 08:26:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jmG5q-0002sq-1f for guix-patches@gnu.org; Fri, 19 Jun 2020 08:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jmG5p-0004or-Uz for guix-patches@gnu.org; Fri, 19 Jun 2020 08:26:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41882] [PATCH] channels: Allow specifying per-channel --allow-downgrades in the channel file Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 19 Jun 2020 12:26:01 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 41882@debbugs.gnu.org Received: via spool by 41882-submit@debbugs.gnu.org id=B41882.159256953518470 (code B ref 41882); Fri, 19 Jun 2020 12:26:01 +0000 Received: (at 41882) by debbugs.gnu.org; 19 Jun 2020 12:25:35 +0000 Received: from localhost ([127.0.0.1]:55355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmG5P-0004nq-Bt for submit@debbugs.gnu.org; Fri, 19 Jun 2020 08:25:35 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:50338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jmG5M-0004ng-2h for 41882@debbugs.gnu.org; Fri, 19 Jun 2020 08:25:33 -0400 Received: (qmail 30843 invoked by uid 1009); 19 Jun 2020 14:25:30 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25847. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.051619 secs); 19 Jun 2020 12:25:30 -0000 Received: from unknown (HELO gravity) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 19 Jun 2020 14:25:30 +0200 Date: Fri, 19 Jun 2020 14:25:28 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Message-ID: <20200619122528.qt3dkxk5nsu6oasc@gravity> References: <20200615210343.18964-1-kuba@kadziolka.net> <87lfkmrqi7.fsf@gnu.org> <20200618235213.utb3sk6la7mmhqsx@gravity> <875zbnijax.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="i2uqole72os2rrrj" Content-Disposition: inline In-Reply-To: <875zbnijax.fsf@gnu.org> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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: -2.61 X-TUID: +ziEtzBX7vLK --i2uqole72os2rrrj Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. > 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. Regards, Jakub K=C4=85dzio=C5=82ka --i2uqole72os2rrrj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE5Xa/ss9usT31cTO54xWnWEYTFWQFAl7srrgACgkQ4xWnWEYT FWQmLBAAhRDZbCmTArrgtJMVJA5HypHrQ/aMwzLCmkf/x1zGr1l6y/1i+3upAmNA 7q9S7VpYC4ju1CsItKlokkgym+/D3KyVK7Z5iRnDqwfxM+KBCSu3yE2Gr9i5vlE5 O9b08AnPvHsi+8dNCB3rf+b1ZK89GgxeqTg6zcuOKs3+Dn/PCnhvwIFGTbKdSUO0 40e2L91CQds4gcqmqQHwf6G2dLEOBDML5Xefw2fhzM8IevWceRtt38BovtAfyCN+ akeH/ceBk8+liTtt5Cp4tf5T/lc+/kiCxti5awWqa7PHNndx/xn23dPIGxuqEWEn XhttzOEIJ8I4S/f4az0FVXUrKuSSDsaMwnkWljs4wUPjZoChDHB9gDHw/H+52Rru LIRHGqufCVmd6xblBOu+IJTeYVgo7BY+K8g7uSdUBQruyXEHaNj720QmJY8xVEI5 mVVxQsriaNvFi7REoj023A8dxDVPEu4kx3Wt69id+2fuL0qFZZ5M1aXUPGQ3mK99 t864n4lEuFSZqoo+B6b0Lhe99wLcUfAEXmkRgEG0rNwV85Ql2zFIlSvt7c/hr3vM n/PoH8wHTI8meideuvLPdVLUC8o7nS2hN08KdYA+2+m6IEGtReygVzqsLSZztoe9 8sQmitq9OfKAy+8TgiBFKh2cc6cQZdOS9taO9REQDpFpj8h0c2E= =vDG9 -----END PGP SIGNATURE----- --i2uqole72os2rrrj--