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 7g2YBZjBxF/FMwAA0tVLHw (envelope-from ) for ; Mon, 30 Nov 2020 09:55:36 +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 wILfAJjBxF9AYwAA1q6Kng (envelope-from ) for ; Mon, 30 Nov 2020 09:55:36 +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 C9EB89404C7 for ; Mon, 30 Nov 2020 09:55:35 +0000 (UTC) Received: from localhost ([::1]:38294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjfuA-0005x6-Oh for larch@yhetil.org; Mon, 30 Nov 2020 04:55:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjfri-0002t5-UB for guix-patches@gnu.org; Mon, 30 Nov 2020 04:53:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42012) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjfri-0000ky-51 for guix-patches@gnu.org; Mon, 30 Nov 2020 04:53:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjfri-0000dN-2I for guix-patches@gnu.org; Mon, 30 Nov 2020 04:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 09:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44785 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hartmut Goebel Cc: 44785@debbugs.gnu.org Received: via spool by 44785-submit@debbugs.gnu.org id=B44785.16067299562405 (code B ref 44785); Mon, 30 Nov 2020 09:53:02 +0000 Received: (at 44785) by debbugs.gnu.org; 30 Nov 2020 09:52:36 +0000 Received: from localhost ([127.0.0.1]:53558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfrI-0000ch-GU for submit@debbugs.gnu.org; Mon, 30 Nov 2020 04:52:36 -0500 Received: from mira.cbaines.net ([212.71.252.8]:55952) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjfrG-0000cZ-Pu for 44785@debbugs.gnu.org; Mon, 30 Nov 2020 04:52:35 -0500 Received: from localhost (188.28.112.52.threembb.co.uk [188.28.112.52]) by mira.cbaines.net (Postfix) with ESMTPSA id B71F527BBF8; Mon, 30 Nov 2020 09:52:33 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 5f581717; Mon, 30 Nov 2020 09:52:31 +0000 (UTC) References: <87r1okh2xn.fsf@cbaines.net> <87wny5u0gz.fsf@cbaines.net> <87h7p9txwv.fsf@cbaines.net> <8595bc86-2bbd-ef47-0505-5066e6be0e92@crazy-compilers.com> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: <8595bc86-2bbd-ef47-0505-5066e6be0e92@crazy-compilers.com> Date: Mon, 30 Nov 2020 09:52:28 +0000 Message-ID: <87k0u3rx2b.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.38 X-Scanner: ns3122888.ip-94-23-21.eu 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-TUID: Ty0vbSfvquB0 --=-=-= Content-Type: text/plain Hartmut Goebel writes: > Hi Christopher, > > Am 28.11.20 um 14:26 schrieb Christopher Baines: >> It won't. However, if two commits change the same place in a file, Git >> can't always work out what to do. For example, two packages get added in >> roughly the same spot. > > I still don't get your point. Merge conflicts are business as usual > and I will of course handle them when applying the patches. My point was nothing more than there will be merge conflicts when merging these patches. I was looking at the data in the patch testing setup I'm working on, which had some trouble processing the patches: https://patchwork.cbaines.net/project/guix-patches/list/?series=5851 > Do you want me to send a new patch-set? Only if you want to, I think there OK as it stands. The only other thing I noticed when looking through them is that the indentation is off, judging by the number of changes when running ./etc/indent-code.el gnu/packages/crates-io.sqcm this isn't something limited to these patches, although it would be nice to fix the indentation for these changes before merging. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl/EwNxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XcfqxAAtYyVByJRk5iPYcNzzh8lPTmnlpF1bh+c rU5YZs2ds1XTVq+2TEpOg5IuIwE4kexNz35zg87nym5Sb0bdsrdPDSbTZkOgi5AR ODwr0+Dh6WDtzyZ+PoEK+qMvmXK2cRkU/092k4yXkS6vUTlEATtqs6+l7S41XfQg 0g2oMfg5F5AO4qFOWjuVGclIXtD9CPa+FFsdFShH9HqUbZIb8uA2B7hgUQpUxRNg tWIXC4qkm8ZtaiJMgW1aTn91SwBKu8en3EnwwQj6CT7WzW/C9x9yGK34zYEpJJz7 NAg1E0vfWazHqjCGvKpfjBzugmFhrZVcH65IMykx7y0bLUiw0o3g7UKp9U02tloL 3r+Qy9R0L1Alu1y1s601/2+h8hEFk/JunWT8oFg4GSrxbBSkRfwaSz9h0gpR6C61 TKjYCornLYOq/r2YNqwzd5ljPv1wksClWGDcmoAANCA1H/k8yV+w+0vXoJzCKhj9 eVRONRUeBzMK2HbftovOCrbWK0ff+U5GhU1jawUeeYlanaim/j7ZBbk/lIikEW3A olcFFhFL+aLn/6ivX0QD7DI11q5VGh9Rxi0HzoKk9mn2jMRw0D46jXFAyargYQbv tUXwE9/RLoIe1TnD1+RizQSltW8RKpZTUrudf6wjtn4sItQrcOjkobv4AhXrX9qr 1RCrpSs12ms= =Pvlk -----END PGP SIGNATURE----- --=-=-=--