[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: |
Mon, 30 Nov 2020 09:52:28 +0000 |
User-agent: |
mu4e 1.4.13; emacs 27.1 |
Hartmut Goebel <h.goebel@crazy-compilers.com> 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
signature.asc
Description: PGP signature
- [bug#44785] [PATCH v2 18/22] gnu: Add rust-hashlink-0.6., (continued)
- [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, 2020/11/28
- [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 <=