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:46:59 +0200 Message-ID: <83y4e1eif0.fsf@gnu.org> 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> <878u61y6tw.fsf@Rainer.invalid> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1447447656 4100 80.91.229.3 (13 Nov 2015 20:47:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 13 Nov 2015 20:47:36 +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:47: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 1ZxLFh-00078I-FO for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 21:47:21 +0100 Original-Received: from localhost ([::1]:55162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxLFg-0002QO-Mj for ged-emacs-devel@m.gmane.org; Fri, 13 Nov 2015 15:47:20 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxLFc-0002KG-4S for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:47:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxLFY-0004jM-0k for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:47:15 -0500 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:47975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxLFX-0004jH-Pd for emacs-devel@gnu.org; Fri, 13 Nov 2015 15:47:11 -0500 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NXR00I00SY8OE00@mtaout29.012.net.il> for emacs-devel@gnu.org; Fri, 13 Nov 2015 22:46:30 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NXR00C6RTPIIL70@mtaout29.012.net.il>; Fri, 13 Nov 2015 22:46:30 +0200 (IST) In-reply-to: <878u61y6tw.fsf@Rainer.invalid> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:194409 Archived-At: > From: Achim Gratz > Date: Fri, 13 Nov 2015 21:36:59 +0100 > > 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. Which indeed makes a mess, see "git log --graph" on master.