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: [RFC] Correctly handling MinGW-w64 Date: Mon, 17 Nov 2014 22:31:04 -0500 Message-ID: References: <87r3x2qyjg.fsf@wanadoo.es> <546973D0.7050306@cs.ucla.edu> <87ioieqxbb.fsf@wanadoo.es> <54697A45.1040505@cs.ucla.edu> <87egt1rhy4.fsf@wanadoo.es> <546A11D5.3090402@cs.ucla.edu> <87a93prfyq.fsf@wanadoo.es> <837fytddih.fsf@gnu.org> <87tx1xptyj.fsf@wanadoo.es> <834mtxbr4t.fsf@gnu.org> <87lhn9ps2c.fsf@wanadoo.es> <83wq6taajc.fsf@gnu.org> <874mtxpj18.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1416281495 3139 80.91.229.3 (18 Nov 2014 03:31:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 03:31:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 04:31:28 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 1XqZVn-0002nh-Jc for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 04:31:27 +0100 Original-Received: from localhost ([::1]:51143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZVn-0006w3-7E for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 22:31:27 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZVS-0006sI-K4 for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:31:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqZVR-0005Ck-EH for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:31:06 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:59663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqZVR-0005CV-Bj for emacs-devel@gnu.org; Mon, 17 Nov 2014 22:31:05 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1XqZVQ-0000gG-Uh; Mon, 17 Nov 2014 22:31:04 -0500 X-Spook: Marxist Agfa warfare Ft. Meade Kosovo CID strategic X-Ran: r+hFT!{Ar!)pYJ\KWx/SoF,%^299!i+.k$H]-%k7/3M:1,9}A~Z"a!0x`fX[%%"C',~H30 X-Hue: white X-Attribution: GM 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:177516 Archived-At: =C3=93scar Fuentes wrote: >> How about applying to both (with a suitable "don't merge to trunk" >> note on emacs-24)? > > Not sure how to do that on an effective way. Write "do not merge to trunk" in the commit log. (And then wait for someone to implement a bzrmerge.el replacement so that actually does something.) > Pushed the change to emacs-24. Let's see how it fares after the next > merge. Ah yes, the "Somebody Else's Problem" method! :) (The ideal solution would be for you to now merge emacs-24 to trunk and resolve the conflicts yourself.)