From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: When do we merge the commits from emacs-25 onto master? Date: Mon, 23 Nov 2015 22:51:26 +0200 Message-ID: <83lh9ozbg1.fsf@gnu.org> References: Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1448311911 20914 80.91.229.3 (23 Nov 2015 20:51:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Nov 2015 20:51:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: bruce.connor.am@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 21:51:40 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 1a0y5L-00041c-7S for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 21:51:39 +0100 Original-Received: from localhost ([::1]:34567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0y5M-0004bt-1J for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2015 15:51:40 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0y5I-0004be-S5 for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:51:37 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a0y5D-0007hi-TR for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:51:36 -0500 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:47800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a0y5D-0007hd-LI for emacs-devel@gnu.org; Mon, 23 Nov 2015 15:51:31 -0500 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NYA00M00CH0CR00@mtaout26.012.net.il> for emacs-devel@gnu.org; Mon, 23 Nov 2015 22:54:25 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NYA00KSSCQPL520@mtaout26.012.net.il>; Mon, 23 Nov 2015 22:54:25 +0200 (IST) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:195144 Archived-At: > Date: Mon, 23 Nov 2015 20:36:50 +0000 > From: Artur Malabarba > > Do we periodically merge stuff from the emacs-25 branch onto master? Yes. > Or do we merge only once (when the release is finalised)? No.