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: Thu, 13 Jun 2002 15:46:41 -0600 (MDT) Sender: emacs-devel-admin@gnu.org Message-ID: <200206132146.g5DLkfB07525@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> <200206121214.g5CCEeG05122@aztec.santafe.edu> <200206121313.g5CDDiU17859@rum.cs.yale.edu> Reply-To: rms@gnu.org NNTP-Posting-Host: localhost.gmane.org X-Trace: main.gmane.org 1024007593 4915 127.0.0.1 (13 Jun 2002 22:33:13 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 13 Jun 2002 22:33:13 +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 17Id9U-0001HA-00 for ; Fri, 14 Jun 2002 00:33:12 +0200 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 17IdXz-00017i-00 for ; Fri, 14 Jun 2002 00:58:31 +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 17IcS6-000463-00; Thu, 13 Jun 2002 17:48:22 -0400 Original-Received: from pele.santafe.edu ([192.12.12.119]) by fencepost.gnu.org with esmtp (Exim 3.34 #1 (Debian)) id 17IcQW-0003ht-00; Thu, 13 Jun 2002 17:46: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 g5DLkgQ19188; Thu, 13 Jun 2002 15:46:42 -0600 (MDT) Original-Received: (from rms@localhost) by aztec.santafe.edu (8.10.2+Sun/8.9.3) id g5DLkfB07525; Thu, 13 Jun 2002 15:46:41 -0600 (MDT) X-Authentication-Warning: aztec.santafe.edu: rms set sender to rms@aztec using -f Original-To: monnier+gnu/emacs@RUM.cs.yale.edu In-Reply-To: <200206121313.g5CDDiU17859@rum.cs.yale.edu> (monnier+gnu/emacs@RUM.cs.yale.edu) 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:4848 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:4848 > Would that solve the problem? I"m not even sure it would. Some of the reasons for conflicts can be that you have local modifications so the md5sum would still be different. Regenerating loaddefs with local modifications will certainly cause differences between your loaddefs and the standard one. People who do that will have to cope with the consequences. However, at present it seems that such differences occur even if you have made no local modifications, which is a more common case and encountered by people with less experience. This is because the modtime of the local checkout copy is different from the modtime of someone else's checkout. Using a checksum (md5 or other) instead of the file modtime would solve that problem. which should mean that merging is never done any more (but you'll probably need to check out a new workarea for the new setting to take effect). What are the results of this?