From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: When do we merge the commits from emacs-25 onto master? Date: Mon, 23 Nov 2015 23:43:21 +0100 Message-ID: <87bnakgwvq.fsf@isaac.fritz.box> References: <56538D97.80905@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448318638 32329 80.91.229.3 (23 Nov 2015 22:43:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2015 22:43:58 +0000 (UTC) Cc: Paul Eggert , emacs-devel To: Artur Malabarba Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 23:43:47 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 1a0zpp-0008Vc-JO for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 23:43:45 +0100 Original-Received: from localhost ([::1]:35031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zpq-0002ZB-1o for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 17:43:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zpc-0002Y0-MT for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:43:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0zpZ-0002ZL-Er for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:43:32 -0500 Original-Received: from randomsample.de ([5.45.97.173]:59381) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0zpZ-0002ZE-5s for emacs-devel@gnu.org; Mon, 23 Nov 2015 17:43:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=2M1dJSszOdOoWjuUKV2iNyXXFCeGzcFU6SkKaucgIo8=; b=cgxOMneM8c+GkkJZYpb7g3CyLST27uZ6LOvFXSLJiRBEPwwDBZ4UCpIiUNiN4J3Axyrt7Y4vq21IcHoJejHQU9F/mDF4eikWMcqSPlWOJHhbVffgde52xUPgcOF1Kndh; Original-Received: from ip4d1645ea.dynamic.kabel-deutschland.de ([77.22.69.234] helo=isaac.fritz.box) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1a0zpX-0007Vs-6O; Mon, 23 Nov 2015 23:43:27 +0100 In-Reply-To: (Artur Malabarba's message of "Mon, 23 Nov 2015 22:34:02 +0000") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:195148 Archived-At: Artur Malabarba writes: > Thanks Paul and Eli. > >> Yes. And you're welcome to do it. We're better off if more people know how to > do it. Please see admin/notes/git-workflow. It needs updating (at least to > change "emacs-24" to "emacs-25"), and you can do that before merging.... > > Would someone kindly do that for me this time? :-) We still haven't figured out how to deal with the generated ChangeLogs, so I'm not sure we should merge at the moment. -David