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: Freeze is almost here Date: Sat, 14 Nov 2015 09:45:10 +0100 Message-ID: <87io55km09.fsf@isaac.fritz.box> 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 1447493876 13869 80.91.229.3 (14 Nov 2015 09:37:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 14 Nov 2015 09:37:56 +0000 (UTC) Cc: jwiegley@gmail.com, Andreas Schwab , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 14 10:37:38 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 1ZxXH3-0002vi-OC for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 10:37:33 +0100 Original-Received: from localhost ([::1]:33110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxXH2-0000jn-UI for ged-emacs-devel@m.gmane.org; Sat, 14 Nov 2015 04:37:32 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxWSc-0004FB-Pb for emacs-devel@gnu.org; Sat, 14 Nov 2015 03:45:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxWSZ-0004Mb-E8 for emacs-devel@gnu.org; Sat, 14 Nov 2015 03:45:26 -0500 Original-Received: from randomsample.de ([5.45.97.173]:47450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxWSZ-0004ME-4K; Sat, 14 Nov 2015 03:45:23 -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=icXC0lun/qkfz8dO5rsEovVqlaZB/6ocxmcnFTGcKKo=; b=WVP5lHlyEQ1FeWTcUu0HYlKd4AScDZsNY7GW6g6kQ7PlSFs1s/9+OpO+3H0ywmpGVEuXHn8mm3zmV6FnLB+nDbrwbto+W7W14K9iVCuYMKruj4+u10M6HBUzr26Jf1oc; 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 1ZxWSS-0003C1-1M; Sat, 14 Nov 2015 09:45:16 +0100 In-Reply-To: <83wptldn2x.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 14 Nov 2015 10:03:50 +0200") 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:194443 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?). By merging master into emacs-25. Git will do a fast-forward by default if it is possible (use --ff-only to abort otherwise). Regarding your 'Backport' messages in the cherry-picks: You only need to do that when there was a conflict. Otherwise, gitmerge.el should detect cherry-picks through the cherry-mark and automatically mark them as to be skipped. However, I realize now that I'm calling the wrong log command for that; I'll fix that over the weekend. -David