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 0P/gNS9Qwl9FXwAA0tVLHw (envelope-from ) for ; Sat, 28 Nov 2020 13:27:11 +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 QA3RMS9Qwl+DFAAAB5/wlQ (envelope-from ) for ; Sat, 28 Nov 2020 13:27:11 +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 A44B6940546 for ; Sat, 28 Nov 2020 13:27:11 +0000 (UTC) Received: from localhost ([::1]:40484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kj0Fq-0001pB-Jj for larch@yhetil.org; Sat, 28 Nov 2020 08:27:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj0Fk-0001p4-HV for guix-patches@gnu.org; Sat, 28 Nov 2020 08:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kj0Fi-0001aT-Ny for guix-patches@gnu.org; Sat, 28 Nov 2020 08:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kj0Fi-0007Bq-Ir for guix-patches@gnu.org; Sat, 28 Nov 2020 08:27: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: Sat, 28 Nov 2020 13:27: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.160657000927620 (code B ref 44785); Sat, 28 Nov 2020 13:27:02 +0000 Received: (at 44785) by debbugs.gnu.org; 28 Nov 2020 13:26:49 +0000 Received: from localhost ([127.0.0.1]:47142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj0FV-0007BP-9a for submit@debbugs.gnu.org; Sat, 28 Nov 2020 08:26:49 -0500 Received: from mira.cbaines.net ([212.71.252.8]:49618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj0FS-0007BF-Kc for 44785@debbugs.gnu.org; Sat, 28 Nov 2020 08:26:47 -0500 Received: from localhost (188.28.112.52.threembb.co.uk [188.28.112.52]) by mira.cbaines.net (Postfix) with ESMTPSA id D11E627BBF8; Sat, 28 Nov 2020 13:26:45 +0000 (GMT) Received: from capella (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id cfbfda8b; Sat, 28 Nov 2020 13:26:43 +0000 (UTC) References: <87r1okh2xn.fsf@cbaines.net> <87wny5u0gz.fsf@cbaines.net> User-agent: mu4e 1.4.13; emacs 27.1 From: Christopher Baines In-reply-to: Date: Sat, 28 Nov 2020 13:26:40 +0000 Message-ID: <87h7p9txwv.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.37 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: 3HAZkCD9VzOE --=-=-= Content-Type: text/plain Hartmut Goebel writes: >> Also, I think there could be some conflicts with a few of the patches >> you sent, the addition of rust-base64-0.13 for example. > > Sorry, I don't understand this remark. Why should adding a package > cause any conflict? 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. The conflict I'm referecning for rust-base64-0.13 is because rust-base58-0.1 has now been added in the same place (above rust-base64-0.12) [1]. 1: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=e94e86c92eddad0abfde00470c0269b4ddb0946e It's just unluckiy that this happened right after you sent your patches. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl/CUBBfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xd6ahAAmmT2KR6qE673J3M/L4ijaNTX5fLSHQt/ fY0HpUiF9/OjUS17KvbJ/SxA4EHJ9n75mKkdItlBLUcIFLA1/AnQzSn61ejxjMyW kcqfS1faa/Jf9BobkWnG7P5PG9jbyJmeAyQTiat0uWPQaph/hQLcEYJ0zhb+iE5a e+2pP74Ai7jn5b1cY8w/X7WrvhY6vqSlWdHKZSLo2QQC3e+NutNru+rqoLWV/9M1 Pove5A6ucnQZz33jCDhi1kmHSixfYAh5tqz8yLLpHQOlsEE2a/mZ5UgE0mFfWGSr 1tppbvafEjsjhQQhgrmoBRKhZ3iKDRYV2K15GfimMXT/pXp6cljgzImBotoP6Vaj TGZgkz+XsMAhCdBeXE7ApZUlIb1zbsuW9uKfu3NCii7IDbThr8ooynDDCf3UCHbw ALukVmuVg97VqDs+eZmLRHtl1HD6aLfC9w3aw037pykxl2sLjAKJnPAxBclji+qk Y5vhOCHvwt5F6jHIyE8KfUrX0HzlwKhLOMgoC0UvteB2UkqEinSwUuLc627l/dX7 pEDn8roxzqn3pXVauzknFtZTKH+n7xp0oRqVXca44iYaDkoB/ir53/bW2hZm/ugg JEPTipv3pSoIdIeeWmBTEC61ZCGYvpfFF3kA5v/K1uRQ+Hc8ClP1unej+DzIQhlM NlSmjGGt21o= =Anrq -----END PGP SIGNATURE----- --=-=-=--