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: configure{.in,} question Date: Mon, 25 Oct 2010 15:59:19 -0400 Message-ID: References: <09k4l72w3b.fsf@fencepost.gnu.org> <83r5fe6te5.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288036791 28212 80.91.229.12 (25 Oct 2010 19:59:51 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 25 Oct 2010 19:59:51 +0000 (UTC) Cc: julien@danjou.info, Eli Zaretskii , emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 25 21:59:48 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 1PATCq-0001I0-RP for ged-emacs-devel@m.gmane.org; Mon, 25 Oct 2010 21:59:47 +0200 Original-Received: from localhost ([127.0.0.1]:48904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PATCo-0006Td-Ed for ged-emacs-devel@m.gmane.org; Mon, 25 Oct 2010 15:59:42 -0400 Original-Received: from [140.186.70.92] (port=34241 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PATCe-0006GM-EJ for emacs-devel@gnu.org; Mon, 25 Oct 2010 15:59:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PATCT-0003Ie-SD for emacs-devel@gnu.org; Mon, 25 Oct 2010 15:59:22 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:29740 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PATCS-0003IQ-Lr; Mon, 25 Oct 2010 15:59:20 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvkIAOt9xUxFxL/T/2dsb2JhbACgU3tyvkiFSASSIg X-IronPort-AV: E=Sophos;i="4.58,237,1286164800"; d="scan'208";a="80655277" Original-Received: from 69-196-191-211.dsl.teksavvy.com (HELO pastel.home) ([69.196.191.211]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 25 Oct 2010 15:59:19 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 55C4AA8519; Mon, 25 Oct 2010 15:59:19 -0400 (EDT) In-Reply-To: (Glenn Morris's message of "Mon, 25 Oct 2010 14:37:48 -0400") 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:132109 Archived-At: >>> I often end up with problems because of configure and >>> src/config.in. >> Including with bzr? What problems are those? > If you run autoconf locally (which I think is good practice), and you > did not use the same version as the person who last committed > configure, you WILL get a conflict when you update. Eg Indeed. >> a feature on the Bazaar list. If you get lucky, you could have a POC >> plugin in a matter of days. > But we cannot make everyone who checks out Emacs from bzr use said > plugin. Actually, maybe for those files, we could use a merge-helper that just says "use the most recent file". Of course, since merge helpers are plugins, that still depends on whether such a merge helper is or will be included in Bzr proper. Stefan