make change-history

make change-history

[Ken Brown]

I'd like to update ChangeLog.3 so that I can fix a typo in a commit 
message.  The commit was made on master.  According to the last sentence 
of admin/notes/repo, I'm supposed to run 'make change-history'.  But 
this doesn't currently work when master is checked out:

$ make change-history
git branch | grep -q '^\* emacs-26$'
make: *** [Makefile:1125: preferred-branch-is-current] Error 1

Can someone tell me how to deal with this (and/or update the 
instructions in admin/notes/repo)?

Thanks.

Ken

Re: make change-history

[Paul Eggert]

Ken Brown wrote:

> $ make change-history
> git branch | grep -q '^\* emacs-26$'
> make: *** [Makefile:1125: preferred-branch-is-current] Error 1
>

I'd change PREFERRED_BRANCH_IS_CURRENT in the master's Makefile. Apparently 
nobody has bothered to do this since emacs-26 forked from master.

Re: make change-history

[Eli Zaretskii]

> From: Paul Eggert <eggert@cs.ucla.edu>
> Date: Sun, 29 Jul 2018 11:10:49 -0700
> 
> Ken Brown wrote:
> 
> > $ make change-history
> > git branch | grep -q '^\* emacs-26$'
> > make: *** [Makefile:1125: preferred-branch-is-current] Error 1
> >
> 
> I'd change PREFERRED_BRANCH_IS_CURRENT in the master's Makefile. Apparently 
> nobody has bothered to do this since emacs-26 forked from master.

Aren't we supposed to run "make change-history" only on the release
branch, to avoid conflicts when merging?

Re: make change-history

[Paul Eggert]

Eli Zaretskii wrote:

> Aren't we supposed to run "make change-history" only on the release
> branch, to avoid conflicts when merging?

Ah, I guess so. I never look at ChangeLog files any more so I'm a bit rusty on 
all this. Sorry about the misadvice.

Re: make change-history

[Ken Brown]

On 7/29/2018 2:34 PM, Paul Eggert wrote:
> Eli Zaretskii wrote:
> 
>> Aren't we supposed to run "make change-history" only on the release
>> branch, to avoid conflicts when merging?
> 
> Ah, I guess so. I never look at ChangeLog files any more so I'm a bit 
> rusty on all this. Sorry about the misadvice.

So the answer is that I should hold my typo correction until an emacs-27 
release branch is created?

Ken

Re: make change-history

[Eli Zaretskii]

> Cc: emacs-devel@gnu.org
> From: Ken Brown <kbrown@cornell.edu>
> Date: Sun, 29 Jul 2018 14:57:13 -0400
> 
> So the answer is that I should hold my typo correction until an emacs-27 
> release branch is created?

Yep.

Re: make change-history

[Stefan Monnier]

>> So the answer is that I should hold my typo correction until an emacs-27 
>> release branch is created?

The "upside" is that neither Paul nor I will ever see your
correction anyway,


        Stefan