all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: kbrown@cornell.edu, emacs-devel@gnu.org
Subject: Re: make change-history
Date: Sun, 29 Jul 2018 21:18:25 +0300	[thread overview]
Message-ID: <838t5trjm6.fsf@gnu.org> (raw)
In-Reply-To: <8fd0a86d-0928-ec4c-a3ec-688bbdcc80c7@cs.ucla.edu> (message from Paul Eggert on Sun, 29 Jul 2018 11:10:49 -0700)

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



  reply	other threads:[~2018-07-29 18:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-29 16:17 make change-history Ken Brown
2018-07-29 18:10 ` Paul Eggert
2018-07-29 18:18   ` Eli Zaretskii [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=838t5trjm6.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=eggert@cs.ucla.edu \
    --cc=emacs-devel@gnu.org \
    --cc=kbrown@cornell.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.