GNU bug report logs - #69509
Request for merging "emacs-team" branch

Previous Next

To reply to this bug, email your comments to 69509 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: Request for merging "emacs-team" branch
Date: Sat, 02 Mar 2024 12:17:34 +0100

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

Message #8 received at 69509 <at> debbugs.gnu.org (full text, mbox):

From: "Suhail Singh" <suhailsingh247 <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 69509 <at> debbugs.gnu.org
Subject: Re: bug#69509: Request for merging "emacs-team" branch
Date: Fri, 22 Mar 2024 14:16:45 -0400

Liliana Marie Prikler <liliana.prikler <at> 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?

-- 
Suhail

Message #11 received at 69509 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Suhail Singh <suhailsingh247 <at> gmail.com>
Cc: 69509 <at> debbugs.gnu.org
Subject: Re: bug#69509: Request for merging "emacs-team" branch
Date: Fri, 22 Mar 2024 20:31:54 +0100

Am Freitag, dem 22.03.2024 um 14:16 -0400 schrieb Suhail Singh:
> Liliana Marie Prikler <liliana.prikler <at> 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

Message #14 received at 69509 <at> debbugs.gnu.org (full text, mbox):

From: Suhail Singh <suhailsingh247 <at> gmail.com>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: 69509 <at> debbugs.gnu.org
Subject: Re: [bug#69509] Request for merging "emacs-team" branch
Date: Sun, 24 Mar 2024 17:27:47 -0400

Liliana Marie Prikler <liliana.prikler <at> 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?

-- 
Suhail

Message #17 received at 69509 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Suhail Singh <suhailsingh247 <at> gmail.com>
Cc: 69509 <at> debbugs.gnu.org
Subject: Re: [bug#69509] Request for merging "emacs-team" branch
Date: Sun, 24 Mar 2024 22:34:55 +0100

Am Sonntag, dem 24.03.2024 um 17:27 -0400 schrieb Suhail Singh:
> Liliana Marie Prikler <liliana.prikler <at> 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.

Message #22 received at 69509-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: guix-devel <at> gnu.org
Cc: 69509-done <at> debbugs.gnu.org, 69414-done <at> debbugs.gnu.org
Subject: Emacs and Gnome branches are merged now
Date: Sat, 30 Mar 2024 10:08:58 +0100

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!

Message #25 received at 69509-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: guix-devel <at> gnu.org, 69509-done <at> debbugs.gnu.org, 69414-done <at> debbugs.gnu.org
Subject: Re: Emacs and Gnome branches are merged now
Date: Sat, 30 Mar 2024 14:20:38 +0000

[Message part 1 (text/plain, inline)]

Liliana Marie Prikler <liliana.prikler <at> 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.

[signature.asc (application/pgp-signature, inline)]

Message #28 received at 69509-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: guix-devel <at> gnu.org, 69509-done <at> debbugs.gnu.org, 69414-done <at> debbugs.gnu.org
Subject: Re: Emacs and Gnome branches are merged now
Date: Wed, 10 Apr 2024 16:04:17 +0200

Hello,

Liliana Marie Prikler <liliana.prikler <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.