From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id IGslOxIMSWDTSwAA0tVLHw (envelope-from ) for ; Wed, 10 Mar 2021 18:12:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YNoGNxIMSWAPGgAAB5/wlQ (envelope-from ) for ; Wed, 10 Mar 2021 18:12:34 +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 86066196F3 for ; Wed, 10 Mar 2021 19:12:34 +0100 (CET) Received: from localhost ([::1]:33920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK3Jw-0003Is-Ms for larch@yhetil.org; Wed, 10 Mar 2021 13:12:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK3EB-0006GY-Ax for guix-devel@gnu.org; Wed, 10 Mar 2021 13:06:35 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:59087) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK3E9-000483-HC for guix-devel@gnu.org; Wed, 10 Mar 2021 13:06:35 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id C43E85C012C; Wed, 10 Mar 2021 13:06:32 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 10 Mar 2021 13:06:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=efmsvmJHxZAvss5vEpw0QaDb QFSdwjBIA6BY+BEuj/4=; b=aXDtbGhLpug3Vs0f+dCSEl170hRhKhcY40ucunR2 n/NnqnFjqFZq/dvvLFTEoNemV6/ldjhQkTll8jkjxXlsAua20hGoGddt5Dkw2dpv Fn3LbrrR0XHn6TMNM+qJz2yRPN5joeEDDSTyxHkgt/bOZ+3tsyBN6FxmrnHkVkcj 6NY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=efmsvm JHxZAvss5vEpw0QaDbQFSdwjBIA6BY+BEuj/4=; b=JbfK5CfLI89rNwQpzNeEL9 /7IXgx1QglGYtZI5AjV6BC7whOdErXBzexq5/yoEyddY0oNF7XcWms9t1JLKrJJ/ USHFbZS6EGvGr2b2ZesbXinePeAkNQYTn7xBLa+OlOtmlcjw1JeWY0M+lCjPBJaf K9fckUIjOpZMJCpbDNNLnUN0UGnFbwRQvjkLIgSdwQN1738JXaY3pFcLRtt8w/uu vUkUxMlCTIHtc5sS5wKxRHGj8lxt7gzSSYg2xEupTfmyuHhTfngVgG6YbCxMJhEU N01z4vuCKoJKytqmopf8AIwPEDLlgSxgjD7jejSAm89PkLY6/5WZkXA9rl4Xdn3Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledruddukedguddtlecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepfffhvffukfhfgggtuggjsehttd ortddttddvnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpefghfejleevteeuvefhheehhfevgf egvedtteetjefhfeefvdfhvddtjeejkedufeenucfkphepuddttddruddurdduieelrddu udeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheplh gvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: from localhost (pool-100-11-169-118.phlapa.fios.verizon.net [100.11.169.118]) by mail.messagingengine.com (Postfix) with ESMTPA id 512301080059; Wed, 10 Mar 2021 13:06:32 -0500 (EST) Date: Wed, 10 Mar 2021 13:06:30 -0500 From: Leo Famulari To: zimoun Subject: Re: Generate diff with git-diff and use in patches field of packages Message-ID: References: <86mtvbcegn.fsf@gmail.com> <86a6radhla.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <86a6radhla.fsf@gmail.com> Received-SPF: pass client-ip=66.111.4.26; envelope-from=leo@famulari.name; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615399954; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=efmsvmJHxZAvss5vEpw0QaDbQFSdwjBIA6BY+BEuj/4=; b=lhyH0upX3QuFmexZSCGVZtu9MAarVmvcCIKvAeZcLypO6th92L2A+XBa0pr2da+PzBNV5w xeBK3cypSt4lfTI6la8vDjIY1raHwvWzhzhGbg1zHbyvY+Ni2KYYhaM+bNgLP/c5w5zcsQ 51WNDhdinuR+3/zHGzE94XLFGVWPLI/vdfsZmUpwGLDrkLXcMDjkCF/PArUl4E6p80m5NW 1CHwQx1RrO+mpFzgMsVq6+jQxmS2F/yDkaGOUvU3pXwjkqSAcw7d6vyfBpmTFeDGK2uhib v5nK4DBvv9ewc98EB3ka/ACOAJMADd1zsujHNCYXItoueLygSeYKl0aZwCAjcw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615399954; a=rsa-sha256; cv=none; b=kiLfJaqRkvG5IpWPOp0wQgGdPkF+2OwuZsI0bhVzG48Sbp2pl8kyg4fGnCvZvCjcEsDLRg GhWVRRWf3KpqwYRwZiAVgBZHLs++BtADjLYiBq0GH/sq+lS+utfcmRb6ZCknPFMK6nPhR2 1NtK6LPPYqd/XVz9ZzC1tcSULXP3qB2s6YDycRWeGnjQbEhnjTAR6yhecWkd4wV5iBwrnG aJX8+/he8MW2XCjjevh4fuRGlse6WP7C0meJUk7tXq0UTWEC81n4sbs+8FGqrHd0t2TDOa 3omaLtvrIVuTV8f3xk9RVEwE9qw8nyvqst0c47mLEZuvuPowdkewPiyLfc8TUw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=aXDtbGhL; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=JbfK5CfL; dmarc=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-Migadu-Spam-Score: -1.39 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=aXDtbGhL; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=JbfK5CfL; dmarc=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-Migadu-Queue-Id: 86066196F3 X-Spam-Score: -1.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: bu/azA3T1Sr1 On Wed, Mar 10, 2021 at 06:49:37PM +0100, zimoun wrote: > I could miss something but I was not suggesting to cherry-pick. :-) > Cherry-picking means use the current packaged version and backport to it > the commit(s) fixing the issue. I know you were not suggesting to cherry-pick. But that is what this thread is about: the best workflow for cherry-picking patches. > I am suggesting to update the packaged version to the upstream version > at commit. But maybe it is not possible because the new upstream has > changed some API or whatever breaking some dependants. We can do that, and sometimes we do. I think we should avoid it when possible, since it's rare that upstream projects intend for us to distribute their development branches.