From: Christopher Baines <mail@cbaines.net>
To: Hartmut Goebel <h.goebel@crazy-compilers.com>
Cc: 44785@debbugs.gnu.org
Subject: [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
Date: Sat, 28 Nov 2020 13:26:40 +0000 [thread overview]
Message-ID: <87h7p9txwv.fsf@cbaines.net> (raw)
In-Reply-To: <e684abcb-19f4-5e14-8c3f-c629bd8b6eb2@crazy-compilers.com>
[-- Attachment #1: Type: text/plain, Size: 767 bytes --]
Hartmut Goebel <h.goebel@crazy-compilers.com> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
next prev parent reply other threads:[~2020-11-28 13:27 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-21 23:12 [bug#44785] [PATCH 00/22] Update sequoia to 0.20.0 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 02/22] gnu: Add rust-win-crypto-ng-0.2 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 03/22] gnu: Add rust-num-bigint-dig-0.6 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 04/22] gnu: Add rust-memsec-0.6 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 05/22] gnu: Add rust-ena-0.14: Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 06/22] gnu: Add rust-lalrpop-util-0.19 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 07/22] gnu: Add rust-lalrpop-0.19 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 08/22] gnu: Add rust-keccak-0.1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 09/22] gnu: Add rust-merlin-2 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 10/22] gnu: Add rust-signature-derive-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 11/22] gnu: Add rust-signature-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 12/22] gnu: Add rust-ed25519-1 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 13/22] gnu: Add rust-curve25519-dalek-3 Hartmut Goebel
2020-11-21 23:13 ` [bug#44785] [PATCH 14/22] gnu: Add rust-ed25519-dalek-1 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 16/22] gnu: Add rust-bzip2-0.3 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 17/22] gnu: Add rust-base64-0.13 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 18/22] gnu: Add rust-hashlink-0.6 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 20/22] gnu: Add rust-libsqlite3-sys-0.20 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 21/22] gnu: Add rust-rusqlite: Update to 0.24 Hartmut Goebel
2020-11-21 23:14 ` [bug#44785] [PATCH 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
2020-11-23 8:50 ` [bug#44785] [PATCH 00/22] Update sequoia " Christopher Baines
2020-11-23 12:27 ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 01/22] gnu: Add rust-rpassword-5 Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 02/22] gnu: Add rust-win-crypto-ng-0.2 Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 03/22] gnu: Add rust-num-bigint-dig-0.6 Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 04/22] gnu: Add rust-memsec-0.6 Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 05/22] gnu: Add rust-ena-0.14: Hartmut Goebel
2020-11-23 12:26 ` [bug#44785] [PATCH v2 06/22] gnu: Add rust-lalrpop-util-0.19 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 07/22] gnu: Add rust-lalrpop-0.19 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 08/22] gnu: Add rust-keccak-0.1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 09/22] gnu: Add rust-merlin-2 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 10/22] gnu: Add rust-signature-derive-1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 11/22] gnu: Add rust-signature-1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 12/22] gnu: Add rust-ed25519-1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 13/22] gnu: Add rust-curve25519-dalek-3 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 14/22] gnu: Add rust-ed25519-dalek-1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 17/22] gnu: Add rust-base64-0.13 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 18/22] gnu: Add rust-hashlink-0.6 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 20/22] gnu: Add rust-libsqlite3-sys-0.20 Hartmut Goebel
2020-11-23 12:27 ` [bug#44817] [PATCH v2 21/22] gnu: rust-rusqlite: Update to 0.24 Hartmut Goebel
2020-11-23 12:27 ` [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0 Hartmut Goebel
2020-11-28 12:31 ` [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 Christopher Baines
2020-11-28 12:51 ` Hartmut Goebel
2020-11-28 13:26 ` Christopher Baines [this message]
2020-11-30 8:21 ` Hartmut Goebel
2020-11-30 9:52 ` Christopher Baines
2020-12-02 20:57 ` bug#44785: " Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87h7p9txwv.fsf@cbaines.net \
--to=mail@cbaines.net \
--cc=44785@debbugs.gnu.org \
--cc=h.goebel@crazy-compilers.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).