From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: [Emacs-diffs] emacs-24 r117695: Fix bug #18995 with compiling
	w32heap.c with -funroll-loops.
Date: Mon, 10 Nov 2014 19:05:59 +0200
Message-ID: <83vbmnm1e0.fsf@gnu.org>
References: <E1XnUsw-0000vL-Au@vcs.savannah.gnu.org>
	<xad28vv6wp.fsf@fencepost.gnu.org> <838ujjnxbi.fsf@gnu.org>
	<uamw7zyp04.fsf@fencepost.gnu.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1415639208 9895 80.91.229.3 (10 Nov 2014 17:06:48 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Mon, 10 Nov 2014 17:06:48 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Glenn Morris <rgm@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 10 18:06:41 2014
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XnsQG-00071w-Dz
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 18:06:36 +0100
Original-Received: from localhost ([::1]:44301 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1XnsQF-000343-VK
	for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 12:06:35 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47447)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1XnsPw-0002v1-HS
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 12:06:22 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1XnsPq-0002hW-CF
	for emacs-devel@gnu.org; Mon, 10 Nov 2014 12:06:16 -0500
Original-Received: from mtaout28.012.net.il ([80.179.55.184]:57030)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1XnsPq-0002hD-53; Mon, 10 Nov 2014 12:06:10 -0500
Original-Received: from conversion-daemon.mtaout28.012.net.il by mtaout28.012.net.il
	(HyperSendmail v2007.08) id <0NEU003002178P00@mtaout28.012.net.il>;
	Mon, 10 Nov 2014 19:03:25 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout28.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0NEU00O6721PYB30@mtaout28.012.net.il>;
	Mon, 10 Nov 2014 19:03:25 +0200 (IST)
In-reply-to: <uamw7zyp04.fsf@fencepost.gnu.org>
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.184
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:176695
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/176695>

> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Mon, 10 Nov 2014 11:55:07 -0500
> 
> Eli Zaretskii wrote:
> 
> > When I committed it to the branch, I debated how to indicate that it
> > doesn't need to be applied to trunk, but there doesn't seem to be
> > anything to support that in bzrmerge.el.  Did I miss something?
> 
> Just write "No need to merge to trunk" in the commit log.

OK, will do (for about a day that's left).