From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Merging emacs-25 into master: changelog issues Date: Thu, 10 Dec 2015 18:39:32 -0800 Organization: UCLA Computer Science Department Message-ID: <566A3764.7070503@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1449801601 18677 80.91.229.3 (11 Dec 2015 02:40:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Dec 2015 02:40:01 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 11 03:39:52 2015 Return-path: Envelope-to: ged-emacs-devel@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 1a7Dcd-0004Hd-NE for ged-emacs-devel@m.gmane.org; Fri, 11 Dec 2015 03:39:51 +0100 Original-Received: from localhost ([::1]:45489 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7Dcd-00051Y-2T for ged-emacs-devel@m.gmane.org; Thu, 10 Dec 2015 21:39:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58816) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7DcQ-00051R-93 for emacs-devel@gnu.org; Thu, 10 Dec 2015 21:39:39 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a7DcN-0006oc-13 for emacs-devel@gnu.org; Thu, 10 Dec 2015 21:39:38 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:56552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a7DcM-0006oO-SE for emacs-devel@gnu.org; Thu, 10 Dec 2015 21:39:34 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 953D7160E73 for ; Thu, 10 Dec 2015 18:39:33 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id PfNDIErf_qSq for ; Thu, 10 Dec 2015 18:39:32 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id A3A03160E75 for ; Thu, 10 Dec 2015 18:39:32 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 9eSOPBdOI8jv for ; Thu, 10 Dec 2015 18:39:32 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 88637160E73 for ; Thu, 10 Dec 2015 18:39:32 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:196084 Archived-At: John Wiegley wrote: > I'd like to get the emacs-25 -> master merge process going on my machine as a > regular activity, but I don't yet know how the changelog stuff is supposed to > work out. Can someone help me to work that out? I proposed something here: https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02546.html The procedure still needs work, though.