From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Fri, 13 Nov 2015 23:46:05 +0200 Message-ID: <56465A1D.6050406@yandex.ru> References: <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> <831tbtfyd4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1447451192 29704 80.91.229.3 (13 Nov 2015 21:46:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 21:46:32 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii , Achim Gratz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 22:46:19 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 1ZxMAk-0001O7-L0 for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 22:46:18 +0100 Original-Received: from localhost ([::1]:55398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxMAk-0002nV-92 for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 16:46:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxMAf-0002m3-JF for emacs-devel@gnu.org; Fri, 13 Nov 2015 16:46:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxMAc-0003Vu-9v for emacs-devel@gnu.org; Fri, 13 Nov 2015 16:46:13 -0500 Original-Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34194) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxMAc-0003Vq-3f; Fri, 13 Nov 2015 16:46:10 -0500 Original-Received: by wmvv187 with SMTP id v187so101035886wmv.1; Fri, 13 Nov 2015 13:46:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=b76io0kM+8hfRA/j/ANWqUmU8SKIccFHOO+xOLIzQQQ=; b=pPgzPRGSFOrpkXrPSl5l9xnpMTTQKTttbzWN8rsHOmVu6KdCdjjx1kzK9L+dG12LhW nmaDVZ4iJKycOYD6F1bpGQFy0pExza8HjbnaRaiZVJ0QfwFwGWGJqbXhSdJQB7xnMIKa 2aLzhkOG5JJuwH8EYmoIvUrZAP07sPu1tg/m5xsTQIAne1KXp4hf4LpFgzYLXNz5xOlV HYGpXCgeIjMrarJzN1WbFHqoqrsESUUtOcZTVvXa4+OAVhdDUT+yh4DC9Mn/h3O9pq7B sIxo4gTJjgmKbsekc1OTwMCJwwxRbKUqeH5eIqAA16j5tLtevSgMk8f97PIILq1wv5vJ Q5+Q== X-Received: by 10.194.190.19 with SMTP id gm19mr28541723wjc.0.1447451169480; Fri, 13 Nov 2015 13:46:09 -0800 (PST) Original-Received: from [192.168.1.2] ([185.105.175.24]) by smtp.googlemail.com with ESMTPSA id h189sm5794194wme.1.2015.11.13.13.46.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Nov 2015 13:46:08 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0 In-Reply-To: <831tbtfyd4.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c09::22c 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:194411 Archived-At: On 11/13/2015 10:17 PM, Eli Zaretskii wrote: > Merging from master to the release branch will likely make a mess when > we later merge back the bugfixes. Like others mentioned, not at all. > Anyway, I already pushed all the cherry-picks (with a special marker > that should exempt them from merging back via gitmerge.el). Yeah, that was premature. John was clearly planning a fast-forward merge from master later today. On the other hand, I don't know why we needed emacs-25 to be created in advance.