From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Achim Gratz Newsgroups: gmane.emacs.devel Subject: Re: Freeze is almost here Date: Fri, 13 Nov 2015 21:36:59 +0100 Organization: Linux Private Site Message-ID: <878u61y6tw.fsf@Rainer.invalid> 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> <87d1vdy8at.fsf@Rainer.invalid> <831tbtfyd4.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1447447077 27358 80.91.229.3 (13 Nov 2015 20:37:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 20:37:57 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 13 21:37:48 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 1ZxL6R-000487-LA for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 21:37:47 +0100 Original-Received: from localhost ([::1]:55123 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxL6Q-00053c-Og for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 15:37:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxL69-00050b-Na for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:37:30 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxL65-000278-Kf for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:37:29 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:40309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxL65-00026o-Dg for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:37:25 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1ZxL5y-0003Yg-FT for emacs-devel@gnu.org; Fri, 13 Nov 2015 21:37:18 +0100 Original-Received: from p54b4753a.dip0.t-ipconnect.de ([84.180.117.58]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Nov 2015 21:37:18 +0100 Original-Received: from Stromeko by p54b4753a.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 13 Nov 2015 21:37:18 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 15 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: p54b4753a.dip0.t-ipconnect.de User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:W0nwxhplbT8MhBTXOZ2ZS2zpUfI= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:194408 Archived-At: Eli Zaretskii writes: > Merging from master to the release branch will likely make a mess when > we later merge back the bugfixes. No, not any more than merging master multiple times into a feature branch does before you push it back to master. Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptation for Waldorf rackAttack V1.04R1: http://Synth.Stromeko.net/Downloads.html#WaldorfSDada