status of emacs-25 branch

status of emacs-25 branch

[Glenn Morris]

Please clarify the status of the emacs-25 branch, probably in an
emacs-announce topic. If it is to continue to be modified, perhaps the
version number should be bumped, and perhaps someone should take
responsibility for syncing it to master. Thanks.

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Tue, 09 May 2017 13:06:31 -0400
> 
> Please clarify the status of the emacs-25 branch, probably in an
> emacs-announce topic. If it is to continue to be modified, perhaps the
> version number should be bumped, and perhaps someone should take
> responsibility for syncing it to master. Thanks.

Its status is unchanged, but the version should indeed be bumped.

As for merging to master, I think I saw Paul doing that recently.

Re: status of emacs-25 branch

[Paul Eggert]

On 05/09/2017 10:47 AM, Eli Zaretskii wrote:
> As for merging to master, I think I saw Paul doing that recently.

As I recall, I did that after 25.2 was released, and wasn't planning to 
do it later unless there's a real need.

Re: status of emacs-25 branch

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Tue, 9 May 2017 12:16:24 -0700
> 
> On 05/09/2017 10:47 AM, Eli Zaretskii wrote:
> > As for merging to master, I think I saw Paul doing that recently.
> 
> As I recall, I did that after 25.2 was released, and wasn't planning to 
> do it later unless there's a real need.

I don't expect to see a significant amount of changes to the branch,
so I believe you are right.

Re: status of emacs-25 branch

[Phillip Lord]

Eli Zaretskii <eliz@gnu.org> writes:

>> Cc: emacs-devel@gnu.org
>> From: Paul Eggert <eggert@cs.ucla.edu>
>> Date: Tue, 9 May 2017 12:16:24 -0700
>> 
>> On 05/09/2017 10:47 AM, Eli Zaretskii wrote:
>> > As for merging to master, I think I saw Paul doing that recently.
>> 
>> As I recall, I did that after 25.2 was released, and wasn't planning to 
>> do it later unless there's a real need.
>
> I don't expect to see a significant amount of changes to the branch,
> so I believe you are right.


Is the bigger question not, what is the status of master?

If Emacs-25 is bug release only, should when is the emacs-26 branch
coming.

Phil

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: phillip.lord@russet.org.uk (Phillip Lord)
> Cc: Paul Eggert <eggert@cs.ucla.edu>,  rgm@gnu.org,  emacs-devel@gnu.org
> Date: Wed, 10 May 2017 18:47:05 +0100
> 
> Is the bigger question not, what is the status of master?

There are many bigger questions.  ;-)  This is one of them, yes.

> If Emacs-25 is bug release only, should when is the emacs-26 branch
> coming.

It is still too early to cut the emacs-26 branch, Emacs 25.2 was
released less than a month ago.  IMO, we should wait a bit longer,
before we decide that emacs-25 will see no more bug-fix releases.

Once that decision is made, we should next decide whether Emacs 26.1
should wait for some unexec solution or not.  If it should wait, we
cannot yet cut a release branch based on master.

Re: status of emacs-25 branch

[Eli Zaretskii]

> Date: Tue, 09 May 2017 20:47:08 +0300
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: emacs-devel@gnu.org
> 
> the version should indeed be bumped.

Done.

Re: status of emacs-25 branch

[Glenn Morris]

Eli Zaretskii wrote:

> Its status is unchanged,

Then I would like to suggest that the next release revert to the
previous practice of forbidding ANY change after the release candidate is
made. (In which case obviously the status has to change after a release.)

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Sun, 14 May 2017 21:09:21 -0400
> 
> Eli Zaretskii wrote:
> 
> > Its status is unchanged,
> 
> Then I would like to suggest that the next release revert to the
> previous practice of forbidding ANY change after the release candidate is
> made.

Why?

Re: status of emacs-25 branch

[John Wiegley]

>>>>> "EZ" == Eli Zaretskii <eliz@gnu.org> writes:

EZ> It is still too early to cut the emacs-26 branch, Emacs 25.2 was released
EZ> less than a month ago. IMO, we should wait a bit longer, before we decide
EZ> that emacs-25 will see no more bug-fix releases.

Agreed.

EZ> Once that decision is made, we should next decide whether Emacs 26.1
EZ> should wait for some unexec solution or not. If it should wait, we cannot
EZ> yet cut a release branch based on master.

I don't think we need to wait for that in particular. It might be nice to get
a new release out with the threading support, start gaining some experience
for that change, while we continue to get unexec ready.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: John Wiegley <jwiegley@gmail.com>
> Cc: phillip.lord@russet.org.uk (Phillip Lord),  rgm@gnu.org,  eggert@cs.ucla.edu,  emacs-devel@gnu.org
> Date: Sun, 21 May 2017 11:37:42 -0400
> 
> EZ> Once that decision is made, we should next decide whether Emacs 26.1
> EZ> should wait for some unexec solution or not. If it should wait, we cannot
> EZ> yet cut a release branch based on master.
> 
> I don't think we need to wait for that in particular. It might be nice to get
> a new release out with the threading support, start gaining some experience
> for that change, while we continue to get unexec ready.

OK, thanks.  I kinda agree.  But meanwhile we had this nasty bug#26952
reported against Emacs 25.2, so I'd like first to see if we can have
an emergency Emacs 25.3 release.

Re: status of emacs-25 branch

[Michael Albinus]

Eli Zaretskii <eliz@gnu.org> writes:

> OK, thanks.  I kinda agree.  But meanwhile we had this nasty bug#26952
> reported against Emacs 25.2, so I'd like first to see if we can have
> an emergency Emacs 25.3 release.

There's also the bug that Tramp is blocked with OpenSSH 7.x(*), which
I've fixed recently in Emacs 26.1. I'll backport it to the emacs-25
branch, because I'll expect more people being hit by this in the near
future. Will do next days.

(*): It was reported on the Tramp ML, see
<http://lists.gnu.org/archive/html/tramp-devel/2017-05/msg00000.html>.

Best regards, Michael.

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Michael Albinus <michael.albinus@gmx.de>
> Cc: John Wiegley <jwiegley@gmail.com>,  rgm@gnu.org,  eggert@cs.ucla.edu,  emacs-devel@gnu.org,  phillip.lord@russet.org.uk
> Date: Sun, 21 May 2017 19:39:45 +0200
> 
> There's also the bug that Tramp is blocked with OpenSSH 7.x(*), which
> I've fixed recently in Emacs 26.1. I'll backport it to the emacs-25
> branch, because I'll expect more people being hit by this in the near
> future. Will do next days.

Is the fix just in 6de77cfa9da1, or are there other changes needed for
this?

Re: status of emacs-25 branch

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

> OK, thanks.  I kinda agree.  But meanwhile we had this nasty bug#26952
> reported against Emacs 25.2, so I'd like first to see if we can have
> an emergency Emacs 25.3 release.

I can make a release if you want (I guess we'll need to go through a few
release candidates?).

Cheers,
Nico

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

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Cc: rgm@gnu.org, eggert@cs.ucla.edu, emacs-devel@gnu.org, phillip.lord@russet.org.uk
> Date: Sun, 21 May 2017 22:38:42 +0200
> 
> I can make a release if you want

Thanks.  Let's see first what people think about this.

> (I guess we'll need to go through a few release candidates?).

No, the plan is just one release tarball.  Nothing's changed on the
release branch since 25.2, except a couple of documentation changes,
and whatever we decide to do to fix bug#26952.

Re: status of emacs-25 branch

[Michael Albinus]

Eli Zaretskii <eliz@gnu.org> writes:

>> There's also the bug that Tramp is blocked with OpenSSH 7.x(*), which
>> I've fixed recently in Emacs 26.1. I'll backport it to the emacs-25
>> branch, because I'll expect more people being hit by this in the near
>> future. Will do next days.
>
> Is the fix just in 6de77cfa9da1, or are there other changes needed for
> this?

Exactly this, nothing else. Is it OK to push it to the emacs-25 branch?

Best regards, Michael.

Re: status of emacs-25 branch

[martin rudalics]

 > Thanks.  Let's see first what people think about this.

About a month ago N. Jackson asked wrt to Bug#25851:

    Can the patch be applied to the emacs-25 branch in case there is
    ever an Emacs 25.3?

and I answered that

    If and when there is let's discuss this with Eli.

So please consider porting that patch to Emacs 25.3 provided you decide
that there will be such a release.  See also Bug#26855 in this regard.

Thanks in advance for your attention, martin

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Michael Albinus <michael.albinus@gmx.de>
> Cc: jwiegley@gmail.com,  eggert@cs.ucla.edu,  emacs-devel@gnu.org,  phillip.lord@russet.org.uk,  rgm@gnu.org
> Date: Mon, 22 May 2017 09:39:13 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> There's also the bug that Tramp is blocked with OpenSSH 7.x(*), which
> >> I've fixed recently in Emacs 26.1. I'll backport it to the emacs-25
> >> branch, because I'll expect more people being hit by this in the near
> >> future. Will do next days.
> >
> > Is the fix just in 6de77cfa9da1, or are there other changes needed for
> > this?
> 
> Exactly this, nothing else. Is it OK to push it to the emacs-25 branch?

Please wait until we decide whether there will be Emacs 25.3.

Re: status of emacs-25 branch

[John Wiegley]

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

>>>>> Eli Zaretskii <eliz@gnu.org> writes:

> OK, thanks. I kinda agree. But meanwhile we had this nasty bug#26952
> reported against Emacs 25.2, so I'd like first to see if we can have an
> emergency Emacs 25.3 release.

That sounds good to me.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

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

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: John Wiegley <jwiegley@gmail.com>
> Cc: phillip.lord@russet.org.uk ,  rgm@gnu.org,  eggert@cs.ucla.edu,  emacs-devel@gnu.org
> Date: Mon, 22 May 2017 16:03:43 -0400
> 
> >>>>> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > OK, thanks. I kinda agree. But meanwhile we had this nasty bug#26952
> > reported against Emacs 25.2, so I'd like first to see if we can have an
> > emergency Emacs 25.3 release.
> 
> That sounds good to me.

Does this mean you agree that we should indeed back-port the hybrid
memory allocator to the emacs-25 branch?  There seems to be some
controversy about this, so I asked for your opinion in
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26952#67.

Re: status of emacs-25 branch

[Eli Zaretskii]

> From: Michael Albinus <michael.albinus@gmx.de>
> Cc: jwiegley@gmail.com,  eggert@cs.ucla.edu,  emacs-devel@gnu.org,  phillip.lord@russet.org.uk,  rgm@gnu.org
> Date: Mon, 22 May 2017 09:39:13 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> There's also the bug that Tramp is blocked with OpenSSH 7.x(*), which
> >> I've fixed recently in Emacs 26.1. I'll backport it to the emacs-25
> >> branch, because I'll expect more people being hit by this in the near
> >> future. Will do next days.
> >
> > Is the fix just in 6de77cfa9da1, or are there other changes needed for
> > this?
> 
> Exactly this, nothing else. Is it OK to push it to the emacs-25 branch?

> Date: Mon, 22 May 2017 17:45:03 +0200
> From: martin rudalics <rudalics@gmx.at>
> CC: John Wiegley <jwiegley@gmail.com>, eggert@cs.ucla.edu, 
>  emacs-devel@gnu.org, phillip.lord@russet.org.uk, rgm@gnu.org, 
>  "N. Jackson" <nljlistbox2@gmail.com>
> 
>  > Thanks.  Let's see first what people think about this.
> 
> About a month ago N. Jackson asked wrt to Bug#25851:
> 
>     Can the patch be applied to the emacs-25 branch in case there is
>     ever an Emacs 25.3?
> 
> and I answered that
> 
>     If and when there is let's discuss this with Eli.
> 
> So please consider porting that patch to Emacs 25.3 provided you decide
> that there will be such a release.  See also Bug#26855 in this regard.

It sounds like there will be no Emacs 25.3, so there's no need to
back-port these to the emacs-25 branch.

Thanks.

Re: status of emacs-25 branch

[Paul Eggert]

Eli Zaretskii wrote:
> It sounds like there will be no Emacs 25.3, so there's no need to
> back-port these to the emacs-25 branch.

OK, I marked Bug#26952 as found in 25.2 and fixed in 26.1, and closed the bug 
report.