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 Date: Fri, 13 Nov 2015 22:17:11 +0200 Message-ID: <831tbtfyd4.fsf@gnu.org> References: <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> <838u61g0sr.fsf@gnu.org> <837fllg06m.fsf@gnu.org> <87d1vdy8at.fsf@Rainer.invalid> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447445934 8573 80.91.229.3 (13 Nov 2015 20:18:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 20:18:54 +0000 (UTC) Cc: emacs-devel@gnu.org To: Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 21:18:45 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 1ZxKny-00087O-Aw for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 21:18:42 +0100 Original-Received: from localhost ([::1]:55009 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKnx-0001Fu-Mo for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 15:18:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKmo-00081H-FF for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:17:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxKmi-0005C7-NI for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:17:30 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:35697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxKmi-0005Bt-Ew for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:17:24 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NXR00100RPTJU00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 13 Nov 2015 22:17:22 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXR001RSSCYE770@a-mtaout20.012.net.il>; Fri, 13 Nov 2015 22:17:22 +0200 (IST) In-reply-to: <87d1vdy8at.fsf@Rainer.invalid> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:194406 Archived-At: > From: Achim Gratz > Date: Fri, 13 Nov 2015 21:05:14 +0100 > > Eli Zaretskii writes: > > I see that you branched emacs-25 not from the latest master. This > > means all the commits since 9463abf will have to be cherry-picked from > > master to the emacs-25 branch. > > That's likely why John plans to merge master into the release branch > again at some later time. This postpones the actual freeze and avoids > the superfluous cherry-picks. Merging from master to the release branch will likely make a mess when we later merge back the bugfixes. Anyway, I already pushed all the cherry-picks (with a special marker that should exempt them from merging back via gitmerge.el).