From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: NT Emacs make problem.. Date: Wed, 12 Jun 2002 06:14:40 -0600 (MDT) Sender: emacs-devel-admin@gnu.org Message-ID: <200206121214.g5CCEeG05122@aztec.santafe.edu> 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> Reply-To: rms@gnu.org NNTP-Posting-Host: localhost.gmane.org X-Trace: main.gmane.org 1023885209 4054 127.0.0.1 (12 Jun 2002 12:33:29 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Wed, 12 Jun 2002 12:33:29 +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 17I7JZ-00013H-00 for ; Wed, 12 Jun 2002 14:33:29 +0200 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 17I7hM-0005LM-00 for ; Wed, 12 Jun 2002 14:58:05 +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 17I72K-0001hK-00; Wed, 12 Jun 2002 08:15:40 -0400 Original-Received: from pele.santafe.edu ([192.12.12.119]) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17I71Q-0008Nl-00; Wed, 12 Jun 2002 08:14:44 -0400 Original-Received: from aztec.santafe.edu (aztec [192.12.12.49]) by pele.santafe.edu (8.11.6+Sun/8.11.6) with ESMTP id g5CCEeQ27270; Wed, 12 Jun 2002 06:14:40 -0600 (MDT) Original-Received: (from rms@localhost) by aztec.santafe.edu (8.10.2+Sun/8.9.3) id g5CCEeG05122; Wed, 12 Jun 2002 06:14:40 -0600 (MDT) X-Authentication-Warning: aztec.santafe.edu: rms set sender to rms@aztec using -f Original-To: Kai.Grossjohann@CS.Uni-Dortmund.DE 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:4789 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:4789 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. 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? If you update these files locally based on the sources as they are in CVS, and someone else updates the VCS versions of these files also based on the sources as they are in CVS, why doesn't CVS just say that the versions agree? Is it because your checked-out file has a different modtime than what is recorded in CVS? If so, maybe we should use md5 checksums instead of file dates in loaddefs.el to determine whether a file has changed. Would that solve the problem? As for cus-load.el, I don't see any reason why it would have such a problem. What is the reason?