[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: I've rebased wip-ppc64le onto core-updates
From: |
Ludovic Courtès |
Subject: |
Re: I've rebased wip-ppc64le onto core-updates |
Date: |
Wed, 10 Mar 2021 11:17:02 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) |
Hi Chris,
Chris Marusich <cmmarusich@gmail.com> skribis:
> I just wanted to let you know that I've rebased the wip-ppc64le branch
> onto core-updates. The wip-ppc64le branch head used to be
> 147b74817e6cf97f37090ecfd52e2588f4c39f7e, but now it's
> df5d633db7acf6389ca9d444b8f5784a0da5ac5d.
>
> I wanted to inform you so you don't get caught off-guard the next time
> you update your local copy.
>
> I've squished some commits together where it made sense to do so. I've
> omitted some commits which were cherry-picked before, but which are
> already in the core-updates branch. And I have explicitly NOT merged
> master into wip-ppc64le at this time.
Noted.
> I have also taken the liberty of cherry-picking Tobias' commit
> 65fb3a3eb9a759e3dba18e78113e80d7e5b353f4 from master, which adds Léo to
> .guix-authorizations. This should allow him to add commits on
> wip-ppc64le without worrying about causing problems for "guix pull"
> later.
Good idea.
We’ll have to think about merging. At things stand, it seems that the
bits that could go to ‘master’ (those that don’t trigger a world
rebuild) are already there, right?
For the rest, we could aim for rebasing on core-updates and merging
there.
WDYT?
Thanks,
Ludo’.
- Re: I've rebased wip-ppc64le onto core-updates,
Ludovic Courtès <=