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: NT Emacs make problem.. Date: Wed, 12 Jun 2002 16:33:40 +0200 Sender: emacs-devel-admin@gnu.org Message-ID: References: <9735-Wed05Jun2002210858+0300-eliz@is.elta.co.il> <200206070044.g570igm25650@aztec.santafe.edu> <5567-Fri07Jun2002163738+0300-eliz@is.elta.co.il> <200206081915.g58JF3228747@aztec.santafe.edu> <200206101014.g5AAEOd01405@aztec.santafe.edu> <200206121214.g5CCEeG05122@aztec.santafe.edu> 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 1023892611 30976 127.0.0.1 (12 Jun 2002 14:36:51 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 12 Jun 2002 14:36:51 +0000 (UTC) Cc: Kai.Grossjohann@CS.Uni-Dortmund.DE, deego@glue.umd.edu, eliz@is.elta.co.il, 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 17I9Ew-00083V-00 for ; Wed, 12 Jun 2002 16:36:50 +0200 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 17I9cn-0008J7-00 for ; Wed, 12 Jun 2002 17:01:29 +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 17I9EV-0005uN-00; Wed, 12 Jun 2002 10:36:23 -0400 Original-Received: from ns.suse.de ([213.95.15.193] helo=Cantor.suse.de) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17I9Bv-0005G4-00; Wed, 12 Jun 2002 10:33:43 -0400 Original-Received: from Hermes.suse.de (Charybdis.suse.de [213.95.15.201]) by Cantor.suse.de (Postfix) with ESMTP id E5CFE146F5; Wed, 12 Jun 2002 16:33:41 +0200 (MEST) X-Authentication-Warning: sykes.suse.de: schwab set sender to schwab@suse.de using -f Original-To: rms@gnu.org X-Yow: .. ich bin in einem dusenjet ins jahr 53 vor chr... ich lande im antiken Rom... einige gladiatoren spielen scrabble... ich rieche PIZZA... In-Reply-To: <200206121214.g5CCEeG05122@aztec.santafe.edu> (Richard Stallman's message of "Wed, 12 Jun 2002 06:14:40 -0600 (MDT)") Original-Lines: 17 User-Agent: Gnus/5.090006 (Oort Gnus v0.06) Emacs/21.3.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:4798 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:4798 Richard Stallman writes: |> Note that "make bootstrap" overwrites some files which are under CVS |> control (in particular, lisp/loaddefs.el and lisp/cus-load.el). So |> subsequent CVS updates might lead to CVS conflicts. |> |> Why do conflicts happen here? Because loaddefs.el contains time stamps. Andreas. -- Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux AG, 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."