(address . guix-patches@gnu.org)
ad28c7e0b621950d262757da745d33da7f626c22.camel@gmail.com
Hi Guix,
emacs-team is in a pretty okay shape right now and folks have asked for
Emacs 29.2, so let's merge it soon™.
Cheers
Request for merging "emacs-team" branch
- Done
Details
- 4 participants
- Liliana Marie Prikler
- Ludovic Courtès
- Christopher Baines
- Suhail Singh
- Owner
- unassigned
- Submitted by
- Liliana Marie Prikler
- Severity
- normal
L
S
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 69509@debbugs.gnu.org)
87jzlut9ma.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
Toggle quote (2 lines)
> folks have asked for Emacs 29.2, so let's merge it soon™.
Is there an estimate by when this merge may happen? On a related note,
are there any blockers that need to be resolved first?
--
Suhail
L
(name . Suhail Singh)(address . suhailsingh247@gmail.com)(address . 69509@debbugs.gnu.org)
abf61817d1622ee77fa38968be2124ac9c55f28d.camel@gmail.com
Am Freitag, dem 22.03.2024 um 14:16 -0400 schrieb Suhail Singh:
Toggle quote (6 lines)
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > folks have asked for Emacs 29.2, so let's merge it soon™.
>
> Is there an estimate by when this merge may happen? On a related
> note, are there any blockers that need to be resolved first?
This weekend or next weekend, depending on CI. emacs-no-x fails to
build, so I need to adapt the sanity check.
Cheers
S
Re: [bug#69509] Request for merging "emacs-team" branch
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 69509@debbugs.gnu.org)
87o7b3pbfw.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
Toggle quote (2 lines)
> This weekend or next weekend, depending on CI.
Emacs 29.3 was just released and it addresses some security
vulnerabilities. Provided it doesn't meaningfully complicate the
impending merge, perhaps it could be included as well?
--
Suhail
L
(name . Suhail Singh)(address . suhailsingh247@gmail.com)(address . 69509@debbugs.gnu.org)
1fe90745d6364ecb3058d6273fde4ea94ad18f48.camel@gmail.com
Am Sonntag, dem 24.03.2024 um 17:27 -0400 schrieb Suhail Singh:
Toggle quote (7 lines)
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > This weekend or next weekend, depending on CI.
>
> Emacs 29.3 was just released and it addresses some security
> vulnerabilities. Provided it doesn't meaningfully complicate the
> impending merge, perhaps it could be included as well?
Next weekend with updated Emacs it is, then. Hopefully it's not more
than a hash bump.
L
Emacs and Gnome branches are merged now
(address . guix-devel@gnu.org)
d49bdf6f6ba7fac37f8d8a0f74134560bcbcbbc4.camel@gmail.com
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!
Closed
C
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
875xx3sqpo.fsf@cbaines.net
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
Toggle quote (2 lines)
> 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
Toggle quote (5 lines)
> 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.
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.
-----BEGIN PGP SIGNATURE-----
iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYIKsNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XeixQ//U74Hgo2UpBAfImHe7Ws8zirmYisQKBPy
V7+N5E9KcgW87DMi5sxuuUOp+5q3f9sp1Ip5q1ZHC3tImju7fPosDO6azxdgzmw9
uZ2Tfgr4X8bAy5SMqEjv7PURAVDp3OJnvI/nWlMD/vDJBtY7VUQnYtwrCWfjuaK6
hVrdlgEDVoxmc4q7N/xQKr54rzk/h1XnCWtkM7hVzvSMph/WE9SL2n61IaNlD39Y
dZsuOkpsga24tjsQSeXWdXwm8cLH+qj1BT06Khn5DqyRfUfEm142hTXDVnzd98/b
jnOlMjS86obTdYCvsAgYW54IBhV1tfHMQOU77/8M4MPoc86rkNU/AzE4MkY7GNU6
tFkMPa3jXDVLFmRlmBQ2DN+W2PQyW0rZp0tSECB7JBz5oL4/2i0gMI7J/Dakix3Z
fdnl8alhEfXfy5akDm/7I6Fn07ODEriLMJ9l91ueQkaB6x92XrpVxbw3kxLW+ZDm
ojvYh7QbP26OzULNCTd6Hk1cvU7h5Lc9CqSUnSw8UgqlonNgizeUsJPwEZ+vErVt
utT+ppQipDFgjFb9TB5aaqJQqk6Vkl/5cwlKHXdVahFeMgxUkQ7o6iJ+U/HjvzOf
E7hcHUtoCQbIe140SGPwNCgPHr4zi2fooZO1edvT56r6jTGb0B1Q2nH/N5XKZEez
uIXLmCqHFIo=
=FwrI
-----END PGP SIGNATURE-----
Closed
L
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87msq1l3fi.fsf@gnu.org
Hello,
Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
Toggle quote (6 lines)
> 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’.
Closed
?