all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* make change-history
@ 2018-07-29 16:17 Ken Brown
  2018-07-29 18:10 ` Paul Eggert
  0 siblings, 1 reply; 7+ messages in thread
From: Ken Brown @ 2018-07-29 16:17 UTC (permalink / raw)
  To: Emacs

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



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 16:17 make change-history Ken Brown
@ 2018-07-29 18:10 ` Paul Eggert
  2018-07-29 18:18   ` Eli Zaretskii
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Eggert @ 2018-07-29 18:10 UTC (permalink / raw)
  To: Ken Brown, Emacs

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.



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 18:10 ` Paul Eggert
@ 2018-07-29 18:18   ` Eli Zaretskii
  2018-07-29 18:34     ` Paul Eggert
  0 siblings, 1 reply; 7+ messages in thread
From: Eli Zaretskii @ 2018-07-29 18:18 UTC (permalink / raw)
  To: Paul Eggert; +Cc: kbrown, emacs-devel

> 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?



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 18:18   ` Eli Zaretskii
@ 2018-07-29 18:34     ` Paul Eggert
  2018-07-29 18:57       ` Ken Brown
  0 siblings, 1 reply; 7+ messages in thread
From: Paul Eggert @ 2018-07-29 18:34 UTC (permalink / raw)
  To: Eli Zaretskii; +Cc: kbrown, emacs-devel

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.



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 18:34     ` Paul Eggert
@ 2018-07-29 18:57       ` Ken Brown
  2018-07-29 19:04         ` Eli Zaretskii
  0 siblings, 1 reply; 7+ messages in thread
From: Ken Brown @ 2018-07-29 18:57 UTC (permalink / raw)
  To: Paul Eggert, Eli Zaretskii; +Cc: emacs-devel

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



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 18:57       ` Ken Brown
@ 2018-07-29 19:04         ` Eli Zaretskii
  2018-07-30 17:10           ` Stefan Monnier
  0 siblings, 1 reply; 7+ messages in thread
From: Eli Zaretskii @ 2018-07-29 19:04 UTC (permalink / raw)
  To: Ken Brown; +Cc: eggert, emacs-devel

> 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.



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: make change-history
  2018-07-29 19:04         ` Eli Zaretskii
@ 2018-07-30 17:10           ` Stefan Monnier
  0 siblings, 0 replies; 7+ messages in thread
From: Stefan Monnier @ 2018-07-30 17:10 UTC (permalink / raw)
  To: emacs-devel

>> 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




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-07-30 17:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-29 16:17 make change-history Ken Brown
2018-07-29 18:10 ` Paul Eggert
2018-07-29 18:18   ` Eli Zaretskii
2018-07-29 18:34     ` Paul Eggert
2018-07-29 18:57       ` Ken Brown
2018-07-29 19:04         ` Eli Zaretskii
2018-07-30 17:10           ` Stefan Monnier

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.