From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: config.in Date: Wed, 17 Apr 2002 11:28:03 +0200 Sender: emacs-devel-admin@gnu.org Message-ID: References: <87g01vbhzi.fsf@tc-1-100.kawasaki.gol.ne.jp> <1018986015.10524.108.camel@space-ghost> <1676-Wed17Apr2002000044+0300-eliz@is.elta.co.il> <7484-Wed17Apr2002083348+0300-eliz@is.elta.co.il> NNTP-Posting-Host: localhost.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Trace: main.gmane.org 1019035815 29276 127.0.0.1 (17 Apr 2002 09:30:15 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 17 Apr 2002 09:30:15 +0000 (UTC) Cc: Eli Zaretskii , walters@verbum.org, emacs-devel@gnu.org Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.33 #1 (Debian)) id 16xllX-0007c5-00 for ; Wed, 17 Apr 2002 11:30:15 +0200 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 16xm49-0005er-00 for ; Wed, 17 Apr 2002 11:49:30 +0200 Original-Received: from localhost ([127.0.0.1] helo=fencepost.gnu.org) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 16xllY-0003RD-00; Wed, 17 Apr 2002 05:30:16 -0400 Original-Received: from ns.suse.de ([213.95.15.193] helo=Cantor.suse.de) by fencepost.gnu.org with smtp (Exim 3.34 #1 (Debian)) id 16xljR-0003BQ-00; Wed, 17 Apr 2002 05:28:05 -0400 Original-Received: from Hermes.suse.de (Charybdis.suse.de [213.95.15.201]) by Cantor.suse.de (Postfix) with ESMTP id 8192C1E441; Wed, 17 Apr 2002 11:28:04 +0200 (MEST) X-Authentication-Warning: sykes.suse.de: schwab set sender to schwab@suse.de using -f Original-To: Miles Bader X-Yow: ..I must be a VETERINARIAN.. In-Reply-To: (Miles Bader's message of "17 Apr 2002 14:54:35 +0900") Original-Lines: 18 User-Agent: Gnus/5.090005 (Oort Gnus v0.05) Emacs/21.2.50 (ia64-suse-linux) Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.9 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:2692 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:2692 Miles Bader writes: |> That is an annoying and error-prone method of dealing with the problem |> (and yes, it's a problem, that's why this issue keeps coming up); more |> often than not, by the time you realize something's amiss, it's too |> late, and CVS has screwed up the file by inserting conflict markers. For files like config.in the chances that conflicts happen are rather low, unless you change configure.in in the first place. This is quite different from loaddefs.el, which also contains local time stamps. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE GmbH, Deutschherrnstr. 15-19, D-90429 Nürnberg Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."