[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2
From: |
Christopher Baines |
Subject: |
[bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2 |
Date: |
Sat, 28 Nov 2020 13:26:40 +0000 |
User-agent: |
mu4e 1.4.13; emacs 27.1 |
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.
signature.asc
Description: PGP signature
- [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1., (continued)
- [bug#44785] [PATCH v2 15/22] gnu: Add rust-dyn-clone-1., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 17/22] gnu: Add rust-base64-0.13., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 18/22] gnu: Add rust-hashlink-0.6., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 19/22] gnu: Add rust-hashbrown-0.9., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 20/22] gnu: Add rust-libsqlite3-sys-0.20., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 14/22] gnu: Add rust-ed25519-dalek-1., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 16/22] gnu: Add rust-bzip2-0.4., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 22/22] gnu: sequoia: Update to 0.20.0., Hartmut Goebel, 2020/11/23
- [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2, Christopher Baines, 2020/11/28
- [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2, Hartmut Goebel, 2020/11/28
- [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2,
Christopher Baines <=
- [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2, Hartmut Goebel, 2020/11/30
- [bug#44785] [PATCH v2 00/22] Update sequoia to 0.20.0 - version 2, Christopher Baines, 2020/11/30