bug#24062: Temporary NEWS markup still in RC

bug#24062: Temporary NEWS markup still in RC

[Glenn Morris]

Package: emacs

The temporary NEWS markup is still in place in the RC.
It should have been removed, together with a final check that everything
that should be has been documented, and any potential reordering of NEWS
topics.

Also, the final top-level ChangeLog and ChangeLog.2 entries are a bit
messy. The "25.1 released" should be in ChangeLog (at the top), not
ChangeLog.2. Both files have some ";;" entries that should not be there.
"Bump version for RC" should probably just be removed.

(Please review admin/release-process and admin/make-tarball.txt for other
items that may need doing.)

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

Hi Glenn,

> The temporary NEWS markup is still in place in the RC.
> It should have been removed, together with a final check that everything
> that should be has been documented, and any potential reordering of NEWS
> topics.

Thanks for pointing it out Glenn.

> Also, the final top-level ChangeLog and ChangeLog.2 entries are a bit
> messy. The "25.1 released" should be in ChangeLog (at the top), not
> ChangeLog.2. Both files have some ";;" entries that should not be there.
> "Bump version for RC" should probably just be removed.

I'll take care of that, thank you.

Nico

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

bug#24062: Temporary NEWS markup still in RC

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Sun, 24 Jul 2016 14:47:46 -0400
> 
> The temporary NEWS markup is still in place in the RC.
> It should have been removed

Right.

> together with a final check that everything that should be has been
> documented, and any potential reordering of NEWS topics.

This has already been done.  NEWS was not touched since May,
basically.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> The temporary NEWS markup is still in place in the RC.

I remove the temporary marks in the NEWS file (in commit 6bdf687).

I'm leaving this bug open as a reminder for the ChangeLog files.

Nico

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

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> Also, the final top-level ChangeLog and ChangeLog.2 entries are a bit
> messy. The "25.1 released" should be in ChangeLog (at the top), not
> ChangeLog.2.

I've cleaned it up for the next RC, I'm now closing this issue.

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Glenn Morris]

> Glenn Morris <rgm@gnu.org> writes:
>
>> Also, the final top-level ChangeLog and ChangeLog.2 entries are a bit
>> messy. The "25.1 released" should be in ChangeLog (at the top), not
>> ChangeLog.2.

Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
be added by untarring, editing that one file, and tarring up again. But
perhaps no-one wants/needs it.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
> be added by untarring, editing that one file, and tarring up again. But
> perhaps no-one wants/needs it.

Indeed, and we said that we would not modify tarballs in place.  I'll do
it for the next RC or release.

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Glenn Morris]

Nicolas Petton wrote:

>> Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
>> be added by untarring, editing that one file, and tarring up again. But
>> perhaps no-one wants/needs it.
>
> Indeed, and we said that we would not modify tarballs in place.  I'll do
> it for the next RC or release.

I did not mean modify a tarfile in place.
I meant what is written in make-tarball:
 
    If you need to change only a file(s) that cannot possibly affect
    the build (README, ChangeLog, NEWS, etc.) then rather than doing
    an entirely new build, it is better to unpack the existing
    tarfile, modify the file(s), and tar it back up again.

    Never replace an existing tarfile!

Ie, don't do a make bootstrap, because that is a more error-prone
process and will change every elc file.

This way, you won't need yet another RC for trivia like this.

You won't be replacing the alpha.gnu tarfile in place, you will just be
uploading a (very slightly) different one to ftp.gnu.org. Ie, the final
release will be (trivially) different to the last RC.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> Ie, don't do a make bootstrap, because that is a more error-prone
> process and will change every elc file.
>
> This way, you won't need yet another RC for trivia like this.
>
> You won't be replacing the alpha.gnu tarfile in place, you will just be
> uploading a (very slightly) different one to ftp.gnu.org. Ie, the final
> release will be (trivially) different to the last RC.

You mean uploading it under a different name, like
emacs-25.1-rc3.tar.xz, right?

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
> be added by untarring, editing that one file, and tarring up again. But
> perhaps no-one wants/needs it.

I'll send the tarball of the release to emacs-devel before uploading it,
so people can double-check that everything's ok.

Nico

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

bug#24062: Temporary NEWS markup still in RC

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Mon, 22 Aug 2016 12:45:30 -0400
> Cc: 24062@debbugs.gnu.org
> 
> Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
> be added by untarring, editing that one file, and tarring up again. But
> perhaps no-one wants/needs it.

I think we need it, and also etc/HISTORY should have one more entry.

Thanks.

bug#24062: Temporary NEWS markup still in RC

[John Wiegley]

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

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

>> Now AFAICS there is no "25.1 released" ChangeLog entry at all. One could
>> be added by untarring, editing that one file, and tarring up again. But
>> perhaps no-one wants/needs it.

EZ> I think we need it, and also etc/HISTORY should have one more entry.

I agree.

-- 
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: 629 bytes --]

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

John Wiegley <jwiegley@gmail.com> writes:

> EZ> I think we need it, and also etc/HISTORY should have one more entry.
>
> I agree.

Then I can make another pretest, as I do not want to update the existing
tarball.

What do you think?

Nico

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

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

Hi Eli,

> I think we need it, and also etc/HISTORY should have one more entry.

I don't understand what you mean.  etc/HISTORY has the followyng entry
line 210:

    GNU Emacs 25.1 (2016-08-28) emacs-25.1

Is there something else that is missing?

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Cc: 24062@debbugs.gnu.org
> Date: Mon, 22 Aug 2016 21:54:58 +0200
> 
> > I think we need it, and also etc/HISTORY should have one more entry.
> 
> I don't understand what you mean.  etc/HISTORY has the followyng entry
> line 210:
> 
>     GNU Emacs 25.1 (2016-08-28) emacs-25.1

I was looking in the Git repository, where this line is absent.  Now I
see that it is there in the tarball, so nothing is missing, except
that the release tag will not include that line.

Why wasn't that pushed to the repo?

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

> Why wasn't that pushed to the repo?

make-tarball.txt says it's best to wait for the actual release, so I did
not commit it yet.

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Cc: rgm@gnu.org, 24062@debbugs.gnu.org
> Date: Tue, 23 Aug 2016 10:15:19 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Why wasn't that pushed to the repo?
> 
> make-tarball.txt says it's best to wait for the actual release, so I did
> not commit it yet.

Our release documentation doesn't really fit the RCn type of
semi-releases.  AFAIR, in the entire history of Emacs since the 1990s,
only one release ever had an RC, all the rest went straight from a
pretest to an official release.  That is why make-tarball.txt says
what it says: it doesn't assume that a non-release tarball can become
a release by just renaming the tarball file without any changes in the
contents and in the repository.

bug#24062: Temporary NEWS markup still in RC

[Glenn Morris]

Eli Zaretskii wrote:

> Our release documentation doesn't really fit the RCn type of
> semi-releases.

I think it does, but improvements always welcome.

> AFAIR, in the entire history of Emacs since the 1990s, only one
> release ever had an RC, all the rest went straight from a pretest to
> an official release.

Nope. Every member of the 24 series, and at least most/all of the 23
series had one or more RCs.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

> I was looking in the Git repository, where this line is absent.  Now I
> see that it is there in the tarball, so nothing is missing, except
> that the release tag will not include that line.

Now I see that the ChangeLog I have locally has the following entry:

    2016-08-28  Nicolas Petton  <nicolas@petton.fr>

   	* Version 25.1 released.

    See ChangeLog.2 for earlier changes.

So I'm a bit confused, I must have done something wrong, but I can do
another tarball with this (named RC3).  John, Eli, is that what we want?

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Cc: rgm@gnu.org, 24062@debbugs.gnu.org
> Date: Tue, 23 Aug 2016 10:19:41 +0200
> 
> Now I see that the ChangeLog I have locally has the following entry:
> 
>     2016-08-28  Nicolas Petton  <nicolas@petton.fr>
> 
>    	* Version 25.1 released.
> 
>     See ChangeLog.2 for earlier changes.
> 
> So I'm a bit confused, I must have done something wrong, but I can do
> another tarball with this (named RC3).  John, Eli, is that what we want?

Making another RC just for ChangeLog changes sounds excessive to me.
I suggest you do that for the final tarball, after we decide to
release 25.1.

Thanks.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

> Making another RC just for ChangeLog changes sounds excessive to me.
> I suggest you do that for the final tarball, after we decide to
> release 25.1.

Works for me!

Cheers,
Nico

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

bug#24062: Temporary NEWS markup still in RC

[Glenn Morris]

Nicolas Petton wrote:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> I was looking in the Git repository, where this line is absent.  Now I
>> see that it is there in the tarball, so nothing is missing, except
>> that the release tag will not include that line.
>
> Now I see that the ChangeLog I have locally has the following entry:
>
>     2016-08-28  Nicolas Petton  <nicolas@petton.fr>
>
>    	* Version 25.1 released.
>
>     See ChangeLog.2 for earlier changes.

Nobody's every done a "have a generated ChangeLog" release before.
I tried to adjust the documentation and M-x add-release-logs accordingly.
My idea was that line would be in the tarfile in (non-versioned)
ChangeLog, and not committed (to ChangeLog.2) till the actual release.
This is basically how it used to work when the ChangeLog was versioned,
just with a slight tweak of having to move the entry to a different file.

bug#24062: Temporary NEWS markup still in RC

[Nicolas Petton]

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

Glenn Morris <rgm@gnu.org> writes:

> Nobody's every done a "have a generated ChangeLog" release before.
> I tried to adjust the documentation and M-x add-release-logs accordingly.
> My idea was that line would be in the tarfile in (non-versioned)
> ChangeLog, and not committed (to ChangeLog.2) till the actual release.

That's exactly what I intended to do, but obviously I did something wrong
in the process.

Cheers,
Nico

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