From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: make change-history Date: Sun, 29 Jul 2018 21:18:25 +0300 Message-ID: <838t5trjm6.fsf@gnu.org> References: <8fd0a86d-0928-ec4c-a3ec-688bbdcc80c7@cs.ucla.edu> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1532888217 6628 195.159.176.226 (29 Jul 2018 18:16:57 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 29 Jul 2018 18:16:57 +0000 (UTC) Cc: kbrown@cornell.edu, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jul 29 20:16:53 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fjqFR-0001ed-3r for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2018 20:16:53 +0200 Original-Received: from localhost ([::1]:49292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjqHX-00036r-TX for ged-emacs-devel@m.gmane.org; Sun, 29 Jul 2018 14:19:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjqGv-00036l-7U for emacs-devel@gnu.org; Sun, 29 Jul 2018 14:18:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjqGq-00065v-7f for emacs-devel@gnu.org; Sun, 29 Jul 2018 14:18:25 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:43260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjqGq-00065r-3f; Sun, 29 Jul 2018 14:18:20 -0400 Original-Received: from [176.228.60.248] (port=3515 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1fjqGp-000644-HE; Sun, 29 Jul 2018 14:18:19 -0400 In-reply-to: <8fd0a86d-0928-ec4c-a3ec-688bbdcc80c7@cs.ucla.edu> (message from Paul Eggert on Sun, 29 Jul 2018 11:10:49 -0700) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:227958 Archived-At: > From: Paul Eggert > 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?