#78257 Request for merging "emacs-team" branch

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

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

To: guix-patches@gnu.org

Cc: ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org, liliana.prikler@gmail.com

Subject: Request for merging "emacs-team" branch

Date: Mon, 05 May 2025 11:11:14 +0200

Hi Guix,

following a recent discussion over at guix-devel, emacs-team appears to
be ready for merging with only few packages still failing to build. 
There are still a few team branches waiting before us, so anyone
willing to iron out remaining bugs is free to do so in the meantime.

Cheers

Message #8 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: ngraves@ngraves.fr

To: Liliana Marie Prikler <liliana.prikler@gmail.com>, 78257@debbugs.gnu.org

Cc: ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org, liliana.prikler@gmail.com

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Mon, 05 May 2025 12:32:22 +0200

Did some work in 78095, sometimes skipping instead of trying to run
tests when that was not easy.

On 2025-05-05 11:11, Liliana Marie Prikler wrote:

> Hi Guix,
>
> following a recent discussion over at guix-devel, emacs-team appears to
> be ready for merging with only few packages still failing to build. 
> There are still a few team branches waiting before us, so anyone
> willing to iron out remaining bugs is free to do so in the meantime.
>
> Cheers
>
>
>

-- 
Best regards,
Nicolas Graves

Message #11 received at 78257@debbugs.gnu.org (full text, mbox, reply):

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

To: ngraves@ngraves.fr, 78257@debbugs.gnu.org

Cc: ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Mon, 05 May 2025 12:46:59 +0200

Am Montag, dem 05.05.2025 um 12:32 +0200 schrieb ngraves@ngraves.fr:
> Did some work in 78095, sometimes skipping instead of trying to run
> tests when that was not easy.
Oh, yeah, I saw that and pushed it.  Feel free to pull and close the
bug if you find that everything's fine.

Cheers

Message #14 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

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

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Mon, 9 Jun 2025 18:28:22 +0200

Hello,

following discussions with ngraves I have added the patches of
   https://issues.guix.gnu.org/78599

Apart from that the branch had already been rebased on the most
recent master commit
   03ce76718c41b32d174713c945d269d6fcdd8bf1

Depending on how the other branches fare, emacs-team might be up
relatively soon (I understand there is still work to be done on
core-packages-team and c++-team, while we hope that mesa-updates can be
merged once built out).

Andreas

Message #17 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

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

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Thu, 12 Jun 2025 11:21:44 +0200

Hello!

After the mesa-updates merge, I have rebased on commit
   601ed9166ea264f7ee49d55f3a7f2a24a9cb8746

With the block on c++-team and more work needed on core-packages-team,
this branch is next in line to be merged; please have an eye on it and
either push to master if everything goes well or keep us informed if you
need more time to repair breakage.

Thanks,

Andreas

Message #24 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

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

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Sat, 14 Jun 2025 15:46:45 +0200

Hello,

I have now added an explicit block so that emacs-team becomes first in line.
If everything goes well, please rebase on master and push to master.

There are a number of package updates tagged emacs-team with a green badge
on QA:
   https://qa.guix.gnu.org/patches

Please feel free to either add them on top of the emacs-team branch and
close the issues, or wait until after the merge.

Thanks,

Andreas

Message #27 received at 78257@debbugs.gnu.org (full text, mbox, reply):

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

To: Andreas Enge <andreas@enge.fr>, control@debbugs.gnu.org

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Sat, 14 Jun 2025 16:47:49 +0200

close 78615
close 78645
close 78646
close 78708
close 78710
close 78711
thanks

Am Samstag, dem 14.06.2025 um 15:46 +0200 schrieb Andreas Enge:
> If everything goes well, please rebase on master and push to master.
I assume we still want to wait for QA to process the branch?

> There are a number of package updates tagged emacs-team with a green
> badge on QA:
>    https://qa.guix.gnu.org/patches
> 
> Please feel free to either add them on top of the emacs-team branch
> and close the issues, or wait until after the merge.
See above.

Cheers

Message #30 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

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

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Sat, 14 Jun 2025 16:53:12 +0200

Am Sat, Jun 14, 2025 at 04:47:49PM +0200 schrieb Liliana Marie Prikler:
> Am Samstag, dem 14.06.2025 um 15:46 +0200 schrieb Andreas Enge:
> > If everything goes well, please rebase on master and push to master.
> I assume we still want to wait for QA to process the branch?

Yes, that is what I meant by "things going well"!
And by "rebase on master and push to master", I meant doing so after QA
has processed the branch - I insist on "rebase" just because recently
someone has merged a branch, which we avoid (but I still tend to write
"merge a branch" when I mean "rebase and push").

Andreas

Message #35 received at 78257-done@debbugs.gnu.org (full text, mbox, reply):

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

To: Andreas Enge <andreas@enge.fr>

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, 78257-done@debbugs.gnu.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Sun, 15 Jun 2025 17:30:50 +0200

Am Samstag, dem 14.06.2025 um 16:53 +0200 schrieb Andreas Enge:
> Am Sat, Jun 14, 2025 at 04:47:49PM +0200 schrieb Liliana Marie
> Prikler:
> > Am Samstag, dem 14.06.2025 um 15:46 +0200 schrieb Andreas Enge:
> > > If everything goes well, please rebase on master and push to
> > > master.
> > I assume we still want to wait for QA to process the branch?
> 
> Yes, that is what I meant by "things going well"!
> And by "rebase on master and push to master", I meant doing so after
> QA has processed the branch - I insist on "rebase" just because
> recently someone has merged a branch, which we avoid (but I still
> tend to write "merge a branch" when I mean "rebase and push").
Ahh, thanks for clearing that up.

The branch looked good enough to rebase and push to master, so that's
what I did.  Thanks everyone for your help and endurance.  Have fun
with Emacs 30 (or 31, whichever you prefer).

Cheers

Message #38 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

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

Cc: Christopher Baines <mail@cbaines.net>, ngraves@ngraves.fr, 78257@debbugs.gnu.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, csantosb@inventati.org, andrew@trop.in, hako@ultrarare.space, divya@subvertising.org

Subject: Re: [bug#78257] Request for merging "emacs-team" branch

Date: Sun, 15 Jun 2025 17:43:18 +0200

Am Sun, Jun 15, 2025 at 05:30:50PM +0200 schrieb Liliana Marie Prikler:
> The branch looked good enough to rebase and push to master, so that's
> what I did.  Thanks everyone for your help and endurance.  Have fun
> with Emacs 30 (or 31, whichever you prefer).

Thanks to everyone involved and especially to you, Liliana, for pushing
this through!

Following policy, I have deleted the emacs-team branch, after checking
(manually) that there are no pull requests towards this branch on codeberg.

And I profit from having you all in cc by pointing to emacs related open
issues on debbugs:
   https://issues.guix.gnu.org/search?query=tag%3Ateam-emacs&is=open&package=guix
Maybe some of them can be applied to master, and others be the basis for
the next team branch.

All the best,

Andreas

Message #43 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Rutherther <rutherther@ditigal.xyz>

To: 78257@debbugs.gnu.org

Cc: Andreas Enge <andreas@enge.fr>, ngraves@ngraves.fr, Liliana Marie Prikler <liliana.prikler@gmail.com>

Subject: Re: Request for merging "emacs-team" branch

Date: Wed, 25 Jun 2025 19:08:22 +0200

Hi,

> Following policy, I have deleted the emacs-team branch, after checking
> (manually) that there are no pull requests towards this branch on codeberg.

I am wondering... does this policy still make sense with codeberg and
PRs? If a person knows what team their change goes on, and they know it
can't go directly to master, wouldn't it be beneficial to have a branch
to open against?

Regards
Rutherther

Message #46 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Andreas Enge <andreas@enge.fr>

To: Rutherther <rutherther@ditigal.xyz>

Cc: ngraves@ngraves.fr, Liliana Marie Prikler <liliana.prikler@gmail.com>, 78257@debbugs.gnu.org

Subject: Re: Request for merging "emacs-team" branch

Date: Wed, 25 Jun 2025 19:12:28 +0200

Am Wed, Jun 25, 2025 at 07:08:22PM +0200 schrieb Rutherther:
> I am wondering... does this policy still make sense with codeberg and
> PRs? If a person knows what team their change goes on, and they know it
> can't go directly to master, wouldn't it be beneficial to have a branch
> to open against?

You can always just reopen it. The idea behind the policy is to not have
stray branches of which one does not remember that they have already
been merged.

Andreas

Message #49 received at 78257@debbugs.gnu.org (full text, mbox, reply):

From: Rutherther <rutherther@ditigal.xyz>

To: Andreas Enge <andreas@enge.fr>

Cc: ngraves@ngraves.fr, Liliana Marie Prikler <liliana.prikler@gmail.com>, 78257@debbugs.gnu.org

Subject: Re: Request for merging "emacs-team" branch

Date: Wed, 25 Jun 2025 19:26:34 +0200

Andreas Enge <andreas@enge.fr> writes:

> Am Wed, Jun 25, 2025 at 07:08:22PM +0200 schrieb Rutherther:
>> I am wondering... does this policy still make sense with codeberg and
>> PRs? If a person knows what team their change goes on, and they know it
>> can't go directly to master, wouldn't it be beneficial to have a branch
>> to open against?
>
> You can always just reopen it. The idea behind the policy is to not have
> stray branches of which one does not remember that they have already
> been merged.

People who do not have access to the repository cannot reopen it. That
was my point.

>
> Andreas

Message #52 received at 78257@debbugs.gnu.org (full text, mbox, reply):

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

To: Rutherther <rutherther@ditigal.xyz>, Andreas Enge <andreas@enge.fr>

Cc: ngraves@ngraves.fr, 78257@debbugs.gnu.org

Subject: Re: Request for merging "emacs-team" branch

Date: Wed, 25 Jun 2025 20:25:26 +0200

Am Mittwoch, dem 25.06.2025 um 19:26 +0200 schrieb Rutherther:
> Andreas Enge <andreas@enge.fr> writes:
> 
> > Am Wed, Jun 25, 2025 at 07:08:22PM +0200 schrieb Rutherther:
> > > I am wondering... does this policy still make sense with codeberg
> > > and PRs? If a person knows what team their change goes on, and
> > > they know it can't go directly to master, wouldn't it be
> > > beneficial to have a branch to open against?
> > 
> > You can always just reopen it. The idea behind the policy is to not
> > have stray branches of which one does not remember that they have
> > already been merged.
> 
> People who do not have access to the repository cannot reopen it.
> That was my point.
We can always ask to open up a branch, or open one up as committers and
ask contributors to reparent their pull requests :)

Cheers

Send a report that this bug log contains spam.