From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Sat, 14 Nov 2015 09:16:40 +0100 Message-ID: References: <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> <87d1vdfurp.fsf@igel.home> <83wptldn2x.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447491094 7058 80.91.229.3 (14 Nov 2015 08:51:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 08:51:34 +0000 (UTC) Cc: jwiegley@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 09:51:25 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 1ZxWYN-00038m-Hh for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 09:51:23 +0100 Original-Received: from localhost ([::1]:60861 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxWYM-0006iR-Na for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 03:51:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxW0z-0008Ey-Sr for emacs-devel@gnu.org; Sat, 14 Nov 2015 03:16:54 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxW0z-0005WH-39 for emacs-devel@gnu.org; Sat, 14 Nov 2015 03:16:53 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:55407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxW0t-0005Uv-5v; Sat, 14 Nov 2015 03:16:47 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3nyTz20KYXz3hj93; Sat, 14 Nov 2015 09:16:46 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3nyTz16b6Mzvh29; Sat, 14 Nov 2015 09:16:45 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id SXfXCiaXwUIa; Sat, 14 Nov 2015 09:16:44 +0100 (CET) X-Auth-Info: UlHH624q8FYJmKP1zX2YKQqgdjZffaWllBJ9Pe/UyC9eKnJ+PCIu/2sQjVGk7eif Original-Received: from linux.local (ppp-88-217-3-133.dynamic.mnet-online.de [88.217.3.133]) by mail.mnet-online.de (Postfix) with ESMTPA; Sat, 14 Nov 2015 09:16:44 +0100 (CET) Original-Received: by linux.local (Postfix, from userid 501) id 442EC1E531E; Sat, 14 Nov 2015 09:16:41 +0100 (CET) X-Yow: After THIS, let's go to PHILADELPHIA and have TRIPLETS!! In-Reply-To: <83wptldn2x.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Nov 2015 10:03:50 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 212.18.0.9 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:194436 Archived-At: Eli Zaretskii writes: >> From: Andreas Schwab >> Cc: jwiegley@gmail.com, emacs-devel@gnu.org >> Date: Fri, 13 Nov 2015 22:34:50 +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. >> >> ??? Just fast forward it. > > I didn't know how to do that (can you tell?). git merge > In any case, by the time I got to that, someone already made one > commit to the branch, so I think fast-forwarding would have been > impossible. No, there is no such commit. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."