From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging emacs-23 into trunk
Date: Tue, 09 Nov 2010 23:34:24 -0500
Message-ID: <lahbfpssof.fsf@fencepost.gnu.org>
References: <jwvzktiyyuw.fsf-monnier+emacs@gnu.org>
NNTP-Posting-Host: lo.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: dough.gmane.org 1289363678 24703 80.91.229.12 (10 Nov 2010 04:34:38 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 10 Nov 2010 04:34:38 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 05:34:34 2010
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 ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1PG2OI-0006Ly-03
	for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 05:34:34 +0100
Original-Received: from localhost ([127.0.0.1]:43241 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1PG2OH-0005mH-Dc
	for ged-emacs-devel@m.gmane.org; Tue, 09 Nov 2010 23:34:33 -0500
Original-Received: from [140.186.70.92] (port=36413 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PG2OB-0005lo-Lb
	for emacs-devel@gnu.org; Tue, 09 Nov 2010 23:34:28 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1PG2OA-00035x-MM
	for emacs-devel@gnu.org; Tue, 09 Nov 2010 23:34:27 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50814)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1PG2OA-00035t-I9
	for emacs-devel@gnu.org; Tue, 09 Nov 2010 23:34:26 -0500
Original-Received: from localhost ([127.0.0.1]:34896)
	by fencepost.gnu.org with esmtp (Exim 4.69)
	(envelope-from <rgm@gnu.org>)
	id 1PG2O9-0006i9-7x; Tue, 09 Nov 2010 23:34:25 -0500
X-Spook: Reno Lon Horiuchi nitrate embassy [Hello to all my
X-Ran: gM.~Z<D3M|$b&!j]9[p?L*K$b3x?,+"Js`a1Z~V!$!*y^,my\GZLr=NcPM%oMCQ}wL}gD<
X-Hue: magenta
X-Attribution: GM
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/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: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=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:132495
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/132495>


Can you make it just skip merging configure altogether?
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).