Emacs and Gnome branches are merged now

Emacs and Gnome branches are merged now

[Liliana Marie Prikler]

Hey Guix,

I've now pushed the merge commits for both emacs-team and gnome-team. 
If you have a weak machine, PLEASE DO NOT PULL IMMEDIATELY AND WAIT FOR
CI TO CATCH UP!  Despite efforts to prebuild things on the respective
branches, the merge commit carries with it a rebuild of the most nasty
package to have to compile locally.

Happy Easter!

[bug#69414] Emacs and Gnome branches are merged now

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2085 bytes --]


Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> I've now pushed the merge commits for both emacs-team and gnome-team.

Thank you to everyone involved in getting these changes through :D

> If you have a weak machine, PLEASE DO NOT PULL IMMEDIATELY AND WAIT FOR
> CI TO CATCH UP!  Despite efforts to prebuild things on the respective
> branches, the merge commit carries with it a rebuild of the most nasty
> package to have to compile locally.

I've had a look in to this as it would be good to work out how this
happened, and how we might avoid it in the future.

I had a look at QEMU and gtk, diffing the derivations from the
gnome-team branch prior to the merge to the master branch after the
merge.

QEMU was affected by the usbutils update in
855fecf00f7df8bf878a8ecd47800ea9bdfebea5, which was pushed to master on
the 26th of March. For gtk, it was affected by the psmisc update in
a2d82fbec4254cf6127b15aa3e827d22da235c30 which was pushed at the same
time.

I think the last merge of master in to gnome-team was pushed on the 20th
of March, with the merge of gnome-team in to master being pushed today
on the 30th.

Looking at those dates, it seems like bringing changes from master in to
branches more frequently, or at least just before considering whether
it's ready to merge (and merging if it is) would help to avoid this. 10
days is a long window in which changes can be pushed to master. QA is
meant to pick up when a branch has diverged from master, but the
mechanism is crude and the threshold it was using was very high. I've
now reduced it [1] so QA might warn in the future about this situation.

1: https://git.savannah.gnu.org/cgit/guix/qa-frontpage.git/commit/?id=b1d7225636d7c1946f4718d6441a621d51f8cd6a

While I don't think it's directly relevant, I think it's worth noting
that both changes mentioned above (usbutils and psmisc), we didn't
follow our own guidance on managing patches. psmisc affects more than
300 dependent packages, and while I think that's less of an issue if
changes go through QA, I don't think either of these changes did.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

Re: Emacs and Gnome branches are merged now

[Liliana Marie Prikler]

Am Samstag, dem 30.03.2024 um 14:20 +0000 schrieb Christopher Baines:
> I think the last merge of master in to gnome-team was pushed on the
> 20th of March, with the merge of gnome-team in to master being pushed
> today on the 30th.
Good catch, I should have merged to gnome-team first and then merge to
master.

> Looking at those dates, it seems like bringing changes from master in
> to branches more frequently, or at least just before considering
> whether it's ready to merge (and merging if it is) would help to
> avoid this.
I did try to do weekly merges in the other direction, but it wasn't
always so disciplined about them.  Perhaps we should have a tighter
process for merging, so that things don't get out of hand?  Maybe
document things in the manual as well?

> 10 days is a long window in which changes can be pushed to master. QA
> is meant to pick up when a branch has diverged from master, but the
> mechanism is crude and the threshold it was using was very high. I've
> now reduced it [1] so QA might warn in the future about this
> situation.
Good catch, that ought to encourage more pre-merge thinking.

> While I don't think it's directly relevant, I think it's worth noting
> that both changes mentioned above (usbutils and psmisc), we didn't
> follow our own guidance on managing patches. psmisc affects more than
> 300 dependent packages, and while I think that's less of an issue if
> changes go through QA, I don't think either of these changes did.
We don't even do this for webkit, which is a very annoying nuisance
even if justified by its security nature.  That's why we have grafts!

Cheers

Re: Emacs and Gnome branches are merged now

[Attila Lendvai]

just a heads' up:

after pulling the gnome changes i was unable to log in (empty screen with frozen pointer after the password).

`herd restart elogind` can be used to get back to the login screen.

i could fix it using the following steps:

 1. move away my ~/.local/share/gnome-shell/extensions/
 2. login
 3. start extension config and disable all extensions
 4. re-login, move back that dir
 5. re-login, update some extensions (still disabled)
 6. reenable all extensions in the config

HTH,

-- 
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“The most potent weapon of the oppressor is the mind of the oppressed.”
	— Steve Biko (1946–1977)

Re: Emacs and Gnome branches are merged now

[Ludovic Courtès]

Hello,

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> I've now pushed the merge commits for both emacs-team and gnome-team. 
> If you have a weak machine, PLEASE DO NOT PULL IMMEDIATELY AND WAIT FOR
> CI TO CATCH UP!  Despite efforts to prebuild things on the respective
> branches, the merge commit carries with it a rebuild of the most nasty
> package to have to compile locally.

Congrats to you and everyone involved!

Ludo’.