Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates

Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates

[Mark H Weaver]

Hi Ricardo,

rekado@elephly.net (Ricardo Wurmus) writes:

> rekado pushed a commit to branch core-updates
> in repository guix.
>
> commit 87096247567ac0d4aac3fc5a7a1e150d307c5b80
> Merge: 116ca65 5e6bd3e
> Author: Ricardo Wurmus <rekado@elephly.net>
> Date:   Wed Jun 6 23:01:48 2018 +0200
>
>     Merge branch 'origin/core-updates-next' into core-updates

Umm, did you intend to push this to the 'core-updates' branch on
Savannah?  Core-updates has been frozen for months, and is almost
completely built by Hydra.  It looks like this would entail rebuilding
the entire branch from scratch again.

I would say that we should revert this, but it's not obvious to me how
to revert a merge.

What do you think?

      Mark

Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates

[Mark H Weaver]

Mark H Weaver <mhw@netris.org> writes:

> rekado@elephly.net (Ricardo Wurmus) writes:
>
>> rekado pushed a commit to branch core-updates
>> in repository guix.
>>
>> commit 87096247567ac0d4aac3fc5a7a1e150d307c5b80
>> Merge: 116ca65 5e6bd3e
>> Author: Ricardo Wurmus <rekado@elephly.net>
>> Date:   Wed Jun 6 23:01:48 2018 +0200
>>
>>     Merge branch 'origin/core-updates-next' into core-updates
>
> Umm, did you intend to push this to the 'core-updates' branch on
> Savannah?  Core-updates has been frozen for months, and is almost
> completely built by Hydra.  It looks like this would entail rebuilding
> the entire branch from scratch again.
>
> I would say that we should revert this, but it's not obvious to me how
> to revert a merge.

Based on the assumption that this must have been a mistake, I deleted
the branch and re-pushed it from just before 'core-updates-next' was
merged into it.

      Mark

Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates

[Mark H Weaver]

Hi Ricardo,

Mark H Weaver <mhw@netris.org> writes:

> rekado@elephly.net (Ricardo Wurmus) writes:
>
>> rekado pushed a commit to branch core-updates
>> in repository guix.
>>
>> commit 87096247567ac0d4aac3fc5a7a1e150d307c5b80
>> Merge: 116ca65 5e6bd3e
>> Author: Ricardo Wurmus <rekado@elephly.net>
>> Date:   Wed Jun 6 23:01:48 2018 +0200
>>
>>     Merge branch 'origin/core-updates-next' into core-updates
>
> Umm, did you intend to push this to the 'core-updates' branch on
> Savannah?  Core-updates has been frozen for months, and is almost
> completely built by Hydra.  It looks like this would entail rebuilding
> the entire branch from scratch again.

Ah, I just noticed that you merged 'core-updates' into 'master', so now
this makes sense.  I restored 'core-updates' to the way you had left it.

Personally, I think this merge was premature, with over 900 new failures
on core-updates compared to the previous master branch.  Neither armhf
nor i686 would be able to build a typical system now, because armhf is
missing e2fsprogs and i686 is missing GRUB.  armhf is also missing most
of its GUI programs due to <https://bugs.gnu.org/31708>, and i686 is
missing gst-plugins-base and thus GNOME and many other important GUI
programs and desktops.

       Mark