From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: [RFC] Correctly handling MinGW-w64 Date: Tue, 18 Nov 2014 09:50:58 -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> <87d28l5fr5.fsf@wanadoo.es> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1416322288 20475 80.91.229.3 (18 Nov 2014 14:51:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 14:51:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?windows-1252?Q?=D3scar?= Fuentes Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 15:51:20 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 1Xqk7i-0003NQ-Fv for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 15:51:18 +0100 Original-Received: from localhost ([::1]:53580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqk7i-0000Zr-6F for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 09:51:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqk7X-0000ZW-Kx for emacs-devel@gnu.org; Tue, 18 Nov 2014 09:51:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xqk7Q-0008Jt-50 for emacs-devel@gnu.org; Tue, 18 Nov 2014 09:51:07 -0500 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:51119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqk7Q-0008Jm-1p for emacs-devel@gnu.org; Tue, 18 Nov 2014 09:51:00 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id sAIEowaB023900; Tue, 18 Nov 2014 09:50:59 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id A92E47AC0; Tue, 18 Nov 2014 09:50:58 -0500 (EST) In-Reply-To: <87d28l5fr5.fsf@wanadoo.es> (=?windows-1252?Q?=22=D3scar?= Fuentes"'s message of "Tue, 18 Nov 2014 04:50:22 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5129=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5129> : inlines <1535> : streams <1344597> : uri <1835172> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:177548 Archived-At: > Just tried. Merging all those Changelogs is insane. No, that's the easy part: M-r does a "good enough" job (tho we like to do it slightly differently). The hard part is to deal with the code conflicts: that's what the "don't merge to trunk" annotations are really about. Especially because some of those "don't merge to trunk" might apply without textual conflict (yet should *not* be included: the conflict is at a more conceptual/semantic level). Stefan