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: Wed, 26 Nov 2014 17:15:21 -0500 Message-ID: References: <546D2E75.6090701@cs.ucla.edu> <837fyp7tvi.fsf@gnu.org> <546E2899.4050702@cs.ucla.edu> <54756754.5090103@cs.ucla.edu> <54762721.4060908@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417040189 10918 80.91.229.3 (26 Nov 2014 22:16:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Nov 2014 22:16:29 +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 Wed Nov 26 23:16:21 2014 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 1Xtksn-000568-I2 for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Nov 2014 23:16:21 +0100 Original-Received: from localhost ([::1]:36287 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtksm-0002ii-QN for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Nov 2014 17:16:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48532) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xtksc-0002iT-6v for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 17:16:17 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtksU-0001fM-Of for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 17:16:10 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtksU-0001fI-L4 for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 17:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1XtksU-0006pn-Ds for bug-gnu-emacs@gnu.org; Wed, 26 Nov 2014 17:16: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: Wed, 26 Nov 2014 22:16: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.141704013426225 (code B ref 19113); Wed, 26 Nov 2014 22:16:02 +0000 Original-Received: (at 19113) by debbugs.gnu.org; 26 Nov 2014 22:15:34 +0000 Original-Received: from localhost ([127.0.0.1]:46681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xtks1-0006ov-KS for submit@debbugs.gnu.org; Wed, 26 Nov 2014 17:15:33 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:51349) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xtkrz-0006ok-AL for 19113@debbugs.gnu.org; Wed, 26 Nov 2014 17:15:31 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAQMFLEF029294; Wed, 26 Nov 2014 17:15:21 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 27B554820; Wed, 26 Nov 2014 17:15:21 -0500 (EST) In-Reply-To: <54762721.4060908@cs.ucla.edu> (Paul Eggert's message of "Wed, 26 Nov 2014 11:16:49 -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 RV5137=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5137> : inlines <1565> : streams <1349161> : uri <1836263> 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:96646 Archived-At: >> Why emacs-24? > Because it'd be a pain to deal with the development and master branches > using different policies for ChangeLogs. I guess you're right. > We have enough problems already with the merge procedure (as far as I can > tell, it's never been done since the switch to git). So it'd be much better > to change both branches at once, assuming emacs-24 is still active. I did such a merge already. There's nothing magical about it, and whether it's done in Git or in Bzr makes no real difference (except that we don't yet have the equivalent of bzrmerge.el which helped streamline the process, of course). Stefan