How to update the ChangeLog files in emacs-25?

How to update the ChangeLog files in emacs-25?

[Nicolas Petton]

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

Hi guys,

I'm working on getting the first pretest out, but I'm wondering if (and
how) I should update the ChangeLog files from the git history.

Cheers,
Nico

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

Re: How to update the ChangeLog files in emacs-25?

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Date: Sun, 24 Jan 2016 12:55:45 +0100
> 
> I'm working on getting the first pretest out, but I'm wondering if (and
> how) I should update the ChangeLog files from the git history.

"make change-history-nocommit" in the top-level directory should do
what you want.  You can (and probably should) commit ChangeLog.2 that
gets updated to the repository afterwards.  (There's also the
'change-history' target that automatically commits, but maybe you
shouldn't do that the first time you try it.)

Thanks.

Re: How to update the ChangeLog files in emacs-25?

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

>> From: Nicolas Petton <nicolas@petton.fr>
>> Date: Sun, 24 Jan 2016 12:55:45 +0100
>> 
>> I'm working on getting the first pretest out, but I'm wondering if (and
>> how) I should update the ChangeLog files from the git history.
>
> "make change-history-nocommit"

That was my first guess, but this seems to work only in the master
branch (there is a check for that in the Makefile).

Nico

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

Re: How to update the ChangeLog files in emacs-25?

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Cc: emacs-devel@gnu.org
> Date: Sun, 24 Jan 2016 21:39:27 +0100
> 
> >> I'm working on getting the first pretest out, but I'm wondering if (and
> >> how) I should update the ChangeLog files from the git history.
> >
> > "make change-history-nocommit"
> 
> That was my first guess, but this seems to work only in the master
> branch (there is a check for that in the Makefile).

That's easy to fix, no?

Re: How to update the ChangeLog files in emacs-25?

[Nicolas Petton]

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

Eli Zaretskii <eliz@gnu.org> writes:

> That's easy to fix, no?

Yes, but I thought that this check must be there for a reason...

Nico
-- 
Nicolas Petton
http://nicolas-petton.fr

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

Re: How to update the ChangeLog files in emacs-25?

[Paul Eggert]

Nicolas Petton wrote:
> Eli Zaretskii <eliz@gnu.org> writes:
>
>> That's easy to fix, no?
>
> Yes, but I thought that this check must be there for a reason...

I put it there because I thought it'd be a pain if everybody updated their 
ChangeLog.2 files in their own branches and then tried to merge the results by 
hand. But if people want to take the trouble to do that, by all means go ahead....

Re: How to update the ChangeLog files in emacs-25?

[Nicolas Petton]

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

Paul Eggert <eggert@cs.ucla.edu> writes:

> Nicolas Petton wrote:
>> Eli Zaretskii <eliz@gnu.org> writes:
>>
>>> That's easy to fix, no?
>>
>> Yes, but I thought that this check must be there for a reason...
>
> I put it there because I thought it'd be a pain if everybody updated their 
> ChangeLog.2 files in their own branches and then tried to merge the results by 
> hand. But if people want to take the trouble to do that, by all means
> go ahead....

Ok, I'll remove the check then if that's ok with you.

Nico

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

Re: How to update the ChangeLog files in emacs-25?

[Stefan Monnier]

> Ok, I'll remove the check then if that's ok with you.

Better keep the check and just override it locally for this one time.


        Stefan

Re: How to update the ChangeLog files in emacs-25?

[Nicolas Petton]

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

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Ok, I'll remove the check then if that's ok with you.
>
> Better keep the check and just override it locally for this one time.

But then it means to me that updating the ChangeLogs on emacs-25 is something
that we should avoid doing, which sounds strange (and I'll have to do it
for each pretest, then RC and release, so it looks like it's something
that we should allow).

Nico

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

Re: How to update the ChangeLog files in emacs-25?

[Stefan Monnier]

>>> Ok, I'll remove the check then if that's ok with you.
>> Better keep the check and just override it locally for this one time.
> But then it means to me that updating the ChangeLogs on emacs-25 is something
> that we should avoid doing,

Indeed we should (where possible), because it creates merge conflicts
when the branch is merged back into master.

> which sounds strange (and I'll have to do it for each pretest, then RC
> and release, so it looks like it's something that we should allow).

I understand that.  So either you temporarily override the check
(deciding that it's worthwhile to cause conflicts further down), or you
find a new way that avoids the conflicts (e.g. putting the ChangeLog
entries in a different file from the one used in master).


        Stefan

Re: How to update the ChangeLog files in emacs-25?

[Eli Zaretskii]

> From: Nicolas Petton <nicolas@petton.fr>
> Date: Mon, 25 Jan 2016 16:40:28 +0100
> 
> > Better keep the check and just override it locally for this one time.
> 
> But then it means to me that updating the ChangeLogs on emacs-25 is something
> that we should avoid doing, which sounds strange (and I'll have to do it
> for each pretest, then RC and release, so it looks like it's something
> that we should allow).

FWIW, I think the problems with this are on master now, not on the
branch, so the test should be reversed, until we figure out how to do
it on both branches without screwing up the results.

Re: How to update the ChangeLog files in emacs-25?

[Paul Eggert]

On 01/25/2016 08:10 AM, Eli Zaretskii wrote:
> FWIW, I think the problems with this are on master now, not on the
> branch
+1.  It works just fine if we just do it with one branch, and emacs-25 
should be our focus.

We could change the test just on emacs-25, to check for the emacs-25 
branch, and then not propagate this change to master.

Re: How to update the ChangeLog files in emacs-25?

[Xue Fuqiao]

On Mon, Jan 25, 2016 at 11:40 PM, Nicolas Petton <nicolas@petton.fr> wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> writes:
>
>>> Ok, I'll remove the check then if that's ok with you.
>>
>> Better keep the check and just override it locally for this one time.
>
> But then it means to me that updating the ChangeLogs on emacs-25 is something
> that we should avoid doing, which sounds strange (and I'll have to do it
> for each pretest, then RC and release, so it looks like it's something
> that we should allow).

You can add some comments near `master-branch-is-current' (as a
temporary solution).