From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai =?iso-8859-15?q?Gro=DFjohann?=) Newsgroups: gmane.emacs.devel Subject: Re: NT Emacs make problem.. Date: Wed, 12 Jun 2002 15:37:14 +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=us-ascii X-Trace: main.gmane.org 1023889186 20006 127.0.0.1 (12 Jun 2002 13:39:46 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 12 Jun 2002 13:39:46 +0000 (UTC) Cc: 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 17I8Li-0005CZ-00 for ; Wed, 12 Jun 2002 15:39:46 +0200 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 17I8jX-0006w3-00 for ; Wed, 12 Jun 2002 16:04:23 +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 17I8LK-0006y8-00; Wed, 12 Jun 2002 09:39:22 -0400 Original-Received: from waldorf.cs.uni-dortmund.de ([129.217.4.42]) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17I8JR-0006lp-00; Wed, 12 Jun 2002 09:37:25 -0400 Original-Received: from lothlorien.cs.uni-dortmund.de (lothlorien [129.217.19.67]) by waldorf.cs.uni-dortmund.de with ESMTP id g5CDbKb03836; Wed, 12 Jun 2002 15:37:20 +0200 (MES) Original-Received: from lucy.cs.uni-dortmund.de (lucy [129.217.19.80]) by lothlorien.cs.uni-dortmund.de id PAA26067; Wed, 12 Jun 2002 15:37:14 +0200 (MET DST) Original-Received: by lucy.cs.uni-dortmund.de (Postfix, from userid 6104) id 6E1063B2EE; Wed, 12 Jun 2002 15:37:14 +0200 (CEST) Original-To: rms@gnu.org In-Reply-To: <200206121214.g5CCEeG05122@aztec.santafe.edu> (Richard Stallman's message of "Wed, 12 Jun 2002 06:14:40 -0600 (MDT)") Original-Lines: 25 User-Agent: Gnus/5.090007 (Oort Gnus v0.07) Emacs/21.3.50 (i686-pc-linux-gnu) 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:4793 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:4793 Richard Stallman writes: > Normally, it is not necessary to use "make bootstrap" after every CVS > update. Unless there are problems, "make all" should be used. > > That is a good point. We should state that. OK. > 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? I don't know why the local files end up to be different than the files on the server, but I see CVS conflicts from time to time. (By this I mean that "cvs update" reports the file as "C lisp/cus-load.el".) I could wait for the next conflict and then look for the conflict markers, then post my findings here. kai -- ~/.signature is: umop 3p!sdn (Frank Nobis)