From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#19113: Generate a ChangeLog file from commit logs Date: Sat, 31 Jan 2015 01:33:33 -0500 Message-ID: References: <546D2E75.6090701@cs.ucla.edu> <54B379E5.8000609@cs.ucla.edu> <4dtwzr1zu4.fsf@fencepost.gnu.org> <54B86916.2080402@cs.ucla.edu> <54CBE63D.9040204@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422686055 19099 80.91.229.3 (31 Jan 2015 06:34:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 31 Jan 2015 06:34:15 +0000 (UTC) Cc: 19113@debbugs.gnu.org To: Paul Eggert Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Jan 31 07:34:11 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YHRdC-0006AI-Co for geb-bug-gnu-emacs@m.gmane.org; Sat, 31 Jan 2015 07:34:10 +0100 Original-Received: from localhost ([::1]:39808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHRdB-0000yt-MZ for geb-bug-gnu-emacs@m.gmane.org; Sat, 31 Jan 2015 01:34:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34803) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHRd7-0000tf-R0 for bug-gnu-emacs@gnu.org; Sat, 31 Jan 2015 01:34:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YHRd4-0001kj-Jc for bug-gnu-emacs@gnu.org; Sat, 31 Jan 2015 01:34:05 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:38910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YHRd4-0001kV-GU for bug-gnu-emacs@gnu.org; Sat, 31 Jan 2015 01:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YHRd4-0003mM-3G for bug-gnu-emacs@gnu.org; Sat, 31 Jan 2015 01:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 31 Jan 2015 06:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19113 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 19113-submit@debbugs.gnu.org id=B19113.142268602814498 (code B ref 19113); Sat, 31 Jan 2015 06:34:02 +0000 Original-Received: (at 19113) by debbugs.gnu.org; 31 Jan 2015 06:33:48 +0000 Original-Received: from localhost ([127.0.0.1]:58383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YHRcq-0003lm-ES for submit@debbugs.gnu.org; Sat, 31 Jan 2015 01:33:48 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:36746) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YHRcm-0003lY-Va for 19113@debbugs.gnu.org; Sat, 31 Jan 2015 01:33:45 -0500 Original-Received: from ceviche.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t0V6XXhd012497; Sat, 31 Jan 2015 01:33:33 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id 308CA66100; Sat, 31 Jan 2015 01:33:33 -0500 (EST) In-Reply-To: <54CBE63D.9040204@cs.ucla.edu> (Paul Eggert's message of "Fri, 30 Jan 2015 12:14:53 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5202=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5202> : inlines <2001> : streams <1382290> : uri <1844491> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:98918 Archived-At: >> Could we simply only make the change on master, and keep using the >> ChangeLog files in `emacs-24'? > Not easily, I'm afraid, as the emacs-24 branch would contain patches to > ChangeLog files, and these files should be absent on the master branch. > This would make merges problematic. Sounds less risky than testing the new changelog-free release process on a release which i supposed to be short, tho. Spurious conflicts are part of life, to some extent. Stefan