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: Merging emacs-23 into trunk Date: Wed, 10 Nov 2010 10:38:54 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289403548 1553 80.91.229.12 (10 Nov 2010 15:39:08 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 15:39:08 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 16:39:04 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PGClL-00051i-MV for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 16:39:03 +0100 Original-Received: from localhost ([127.0.0.1]:59881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGClL-0002cd-8D for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 10:39:03 -0500 Original-Received: from [140.186.70.92] (port=37004 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGClG-0002cV-99 for emacs-devel@gnu.org; Wed, 10 Nov 2010 10:38:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGClF-0004ro-9S for emacs-devel@gnu.org; Wed, 10 Nov 2010 10:38:58 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:3860 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGClF-0004rS-71; Wed, 10 Nov 2010 10:38:57 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgwKAGNL2kxMCpqE/2dsb2JhbAChNIEAcr4DhUoEhFqNXg X-IronPort-AV: E=Sophos;i="4.59,178,1288584000"; d="scan'208";a="82115171" Original-Received: from 76-10-154-132.dsl.teksavvy.com (HELO ceviche.home) ([76.10.154.132]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 10 Nov 2010 10:38:55 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id F13D8660DC; Wed, 10 Nov 2010 10:38:54 -0500 (EST) In-Reply-To: (Glenn Morris's message of "Tue, 09 Nov 2010 23:34:24 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132511 Archived-At: > Can you make it just skip merging configure altogether? It "resolves" the conflict automatically by undoing the change. But you could easily add "configure" to the regexp of "commit message words that indicate you might want to skip this commit". It didn't seem worth the trouble since I'd expect "configure" to often be committed together with the corresponding change to configure.in. > It's pointless to merge this generated file between branches, and it > creates merge diffs that are largely noise (eg most recent merge of > emacs23 to trunk). AFAIK the merge I just committed should not have changed ./configure. Stefan