From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris 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 11:55:07 -0500 Message-ID: References: <838ujjnxbi.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1415638550 29960 80.91.229.3 (10 Nov 2014 16:55:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 10 Nov 2014 16:55:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 10 17:55:49 2014 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 1XnsFl-0005WR-2s for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 17:55:45 +0100 Original-Received: from localhost ([::1]:44110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsFk-0007em-Q7 for ged-emacs-devel@m.gmane.org; Mon, 10 Nov 2014 11:55:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsFD-0007c8-Ow for emacs-devel@gnu.org; Mon, 10 Nov 2014 11:55:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XnsFA-000724-KG for emacs-devel@gnu.org; Mon, 10 Nov 2014 11:55:11 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:60909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XnsFA-00071z-Bg for emacs-devel@gnu.org; Mon, 10 Nov 2014 11:55:08 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XnsF9-00040l-EG; Mon, 10 Nov 2014 11:55:07 -0500 X-Spook: Albania bootleg S Box Indigo Iran lynch Downing Street X-Ran: -\DKN1ly4Wk8$;DS}7H|#-z,3By_o? (Eli Zaretskii's message of "Mon, 10 Nov 2014 12:50:57 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:176693 Archived-At: 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. Anything that matches bzrmerge-skip-regexp, to make the merger take note.