bug#70456: Request for merging "core-updates" branch

2024-06-27 Thread Christopher Baines
Christopher Baines writes: > I've spent a bunch of time in the last few days trying to see if I can > get the bordeaux build farm moving on core-updates and I think things > are moving at pace now. Following on from this, builds have mostly paused for the last few days as many changes have

bug#70456: Request for merging core-updates branch

2024-06-23 Thread Maxim Cournoyer
Hi Christopher, Christopher Baines writes: > Maxim Cournoyer writes: > >> Guillaume Le Vaillant writes: >> >>> Lars-Dominik Braun skribis: >>> Hi, it seems the core-updates branch is first in the merge-queue. haskell-team was successfully built by the CI and is ready to

bug#70456: Request for merging "core-updates" branch

2024-06-22 Thread Christopher Baines
Hey, I've spent a bunch of time in the last few days trying to see if I can get the bordeaux build farm moving on core-updates and I think things are moving at pace now. Builds are happening for 6 systems, with the only major omission being i586-gnu, I think there are existing issues with the

bug#70456: Request for merging core-updates branch

2024-06-21 Thread Christopher Baines
Maxim Cournoyer writes: > Guillaume Le Vaillant writes: > >> Lars-Dominik Braun skribis: >> >>> Hi, >>> >>> it seems the core-updates branch is first in the merge-queue. haskell-team >>> was successfully built by the CI and is ready to be merged. Since there >>> does not seem to be an ETA for

bug#70456: Request for merging core-updates branch

2024-06-18 Thread Maxim Cournoyer
Hi, Guillaume Le Vaillant writes: > Maxim Cournoyer skribis: > >> Hi, >> >> Guillaume Le Vaillant writes: >> >>> Lars-Dominik Braun skribis: >>> Hi, it seems the core-updates branch is first in the merge-queue. haskell-team was successfully built by the CI and is ready to

bug#70456: Request for merging core-updates branch

2024-06-17 Thread Guillaume Le Vaillant
Maxim Cournoyer skribis: > Hi, > > Guillaume Le Vaillant writes: > >> Lars-Dominik Braun skribis: >> >>> Hi, >>> >>> it seems the core-updates branch is first in the merge-queue. haskell-team >>> was successfully built by the CI and is ready to be merged. Since there >>> does not seem to be an

bug#70456: Request for merging core-updates branch

2024-06-17 Thread Maxim Cournoyer
Hi, Guillaume Le Vaillant writes: > Lars-Dominik Braun skribis: > >> Hi, >> >> it seems the core-updates branch is first in the merge-queue. haskell-team >> was successfully built by the CI and is ready to be merged. Since there >> does not seem to be an ETA for core-updates, can I skip the

bug#70456: Request for merging core-updates branch

2024-06-14 Thread Guillaume Le Vaillant
Lars-Dominik Braun skribis: > Hi, > > it seems the core-updates branch is first in the merge-queue. haskell-team > was successfully built by the CI and is ready to be merged. Since there > does not seem to be an ETA for core-updates, can I skip the queue and > go ahead with merging haskell-team?

bug#70456: Request for merging core-updates branch

2024-06-14 Thread Lars-Dominik Braun
Hi, it seems the core-updates branch is first in the merge-queue. haskell-team was successfully built by the CI and is ready to be merged. Since there does not seem to be an ETA for core-updates, can I skip the queue and go ahead with merging haskell-team? Lars

bug#70456: Request for merging "core-updates" branch

2024-05-02 Thread Ludovic Courtès
Hi Chris and all, Christopher Baines skribis: > I think keeping the Git commit history clean and representative is > really important, so to me at least this means core-updates can't be > merged to master in it's current form, even if the changes overall from > these 6351 commits are

bug#70456: Request for merging "core-updates" branch

2024-04-26 Thread tumashu
emacs has a script gitmerge.el, it can skip some commit when merge with different merge rule (ours), maybe can make life easier: https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/gitmerge.el https://git.savannah.gnu.org/cgit/emacs.git/tree/admin/notes/git-workflow --

bug#70456: Request for merging "core-updates" branch

2024-04-22 Thread Maxim Cournoyer
Hi Christopher, Christopher Baines writes: [...] > Assuming we merge core-updates without doing anything about these > duplicate commits, and taking the cwltool package as a semi-random > example, if you do: > > git log -p gnu/packages/bioinformatics.scm I trust the 'newest' (appearing

bug#70456: Request for merging "core-updates" branch

2024-04-20 Thread Christopher Baines
Maxim Cournoyer writes: > Hi, > > Christopher Baines writes: > >> Christopher Baines writes: >> >>> I'm also really confused by what commits appear to be on the branch, >>> take 12b15585a75062f3fba09d82861c6fae9a7743b2 which appears to be one >>> core-updates, but it's a duplicate of >>>

bug#70456: Request for merging core-updates branch

2024-04-20 Thread Steve George
Let's see where we are with the branch currently. Thanks, Steve / Futurile

bug#70456: Request for merging "core-updates" branch

2024-04-20 Thread Maxim Cournoyer
Hi, Christopher Baines writes: > Christopher Baines writes: > >> I'm also really confused by what commits appear to be on the branch, >> take 12b15585a75062f3fba09d82861c6fae9a7743b2 which appears to be one >> core-updates, but it's a duplicate of >> e2a7c227dea5b361e2ebdbba24b923d1922a79d0

bug#70456: Request for merging "core-updates" branch

2024-04-19 Thread Christopher Baines
Christopher Baines writes: > I'm also really confused by what commits appear to be on the branch, > take 12b15585a75062f3fba09d82861c6fae9a7743b2 which appears to be one > core-updates, but it's a duplicate of > e2a7c227dea5b361e2ebdbba24b923d1922a79d0 which was pushed to > master. Same with

bug#70456: Request for merging "core-updates" branch

2024-04-19 Thread Christopher Baines
Hey, Thanks for raising this issue Steve, given the branch has been going for around 9 months (since [1]) now, I think it's well overdue to start looking at building and merging it. 1: https://lists.gnu.org/archive/html/guix-commits/2023-07/msg00332.html I pushed a single commit plus a merge