* Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates
[not found] ` <20180606210242.E94BC201F1@vcs0.savannah.gnu.org>
@ 2018-06-07 0:48 ` Mark H Weaver
2018-06-07 0:58 ` Mark H Weaver
2018-06-07 2:07 ` Mark H Weaver
0 siblings, 2 replies; 3+ messages in thread
From: Mark H Weaver @ 2018-06-07 0:48 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates
2018-06-07 0:48 ` 01/01: Merge branch 'origin/core-updates-next' into core-updates Mark H Weaver
@ 2018-06-07 0:58 ` Mark H Weaver
2018-06-07 2:07 ` Mark H Weaver
1 sibling, 0 replies; 3+ messages in thread
From: Mark H Weaver @ 2018-06-07 0:58 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: 01/01: Merge branch 'origin/core-updates-next' into core-updates
2018-06-07 0:48 ` 01/01: Merge branch 'origin/core-updates-next' into core-updates Mark H Weaver
2018-06-07 0:58 ` Mark H Weaver
@ 2018-06-07 2:07 ` Mark H Weaver
1 sibling, 0 replies; 3+ messages in thread
From: Mark H Weaver @ 2018-06-07 2:07 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-07 2:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180606210241.30122.49748@vcs0.savannah.gnu.org>
[not found] ` <20180606210242.E94BC201F1@vcs0.savannah.gnu.org>
2018-06-07 0:48 ` 01/01: Merge branch 'origin/core-updates-next' into core-updates Mark H Weaver
2018-06-07 0:58 ` Mark H Weaver
2018-06-07 2:07 ` Mark H Weaver
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).