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: Freeze is almost here (was: Dynamic loading progress) Date: Fri, 13 Nov 2015 21:24:36 +0200 Message-ID: <838u61g0sr.fsf@gnu.org> References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> <87io5bv1it.fsf@lifelogs.com> <87egfzuwca.fsf@lifelogs.com> <876118u6f2.fsf@lifelogs.com> <87io56qgid.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447442738 22181 80.91.229.3 (13 Nov 2015 19:25:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 19:25:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 20:25:30 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 1ZxJy6-00065u-U7 for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 20:25:07 +0100 Original-Received: from localhost ([::1]:54800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxJy5-00020M-S2 for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 14:25:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxJxr-00020E-Bp for emacs-devel@gnu.org; Fri, 13 Nov 2015 14:24:52 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxJxo-0000Cq-NZ for emacs-devel@gnu.org; Fri, 13 Nov 2015 14:24:51 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:47237) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxJxo-0000Ce-Bf for emacs-devel@gnu.org; Fri, 13 Nov 2015 14:24:48 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NXR00000P58BZ00@mtaout24.012.net.il> for emacs-devel@gnu.org; Fri, 13 Nov 2015 21:17:52 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXR00PLYPLR5U10@mtaout24.012.net.il>; Fri, 13 Nov 2015 21:17:52 +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.180 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:194402 Archived-At: > From: John Wiegley > Date: Fri, 13 Nov 2015 07:39:27 -0800 > > >>>>> Ted Zlatanov writes: > > > John, can the dynamic modules branch be pushed then or do you need it today? > > I'm OK with the delay. > > Sure, it can be pushed then. In fact, anytime next week is OK for that branch. > > I've created the "emacs-25" branch, and will merge from master one last time > in 8.4 hours. After that, only bug fixes should be applied to that branch, or > feature work for those with an exemption. We don't merge from master to the release branch, we merge in the opposite direction. See gitmerge.el. So I think the dynamic modules changes should be applied to emacs-25, and will then be merged to master in due time. > I encourage everyone without pressing feature work to make that branch their > primary working area for the next few months, and to help me categorize the > bugs appropriately. Seconded. in any case, once the release branch is cut, any bugfixes that fix problems visible on emacs-25 should be applied there, not to master (they will be later merged to master via gitmerge.el). The master branch should only get direct commits of fixes for bugs that don't exist on the release branch.