From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bob Proulx Newsgroups: gmane.emacs.help Subject: Re: git: Date: Fri, 27 Feb 2015 17:03:40 -0700 Message-ID: <20150227164806330146789@bob.proulx.com> References: <20150226222407.GA18239@boo.workgroup> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1425081844 17805 80.91.229.3 (28 Feb 2015 00:04:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 28 Feb 2015 00:04:04 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Sat Feb 28 01:03:59 2015 Return-path: Envelope-to: geh-help-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YRUsw-0004I6-Kc for geh-help-gnu-emacs@m.gmane.org; Sat, 28 Feb 2015 01:03:58 +0100 Original-Received: from localhost ([::1]:39459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRUsv-0007LU-Rc for geh-help-gnu-emacs@m.gmane.org; Fri, 27 Feb 2015 19:03:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:53675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRUsl-0007Im-09 for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:03:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRUsg-0001Dj-Vl for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:03:46 -0500 Original-Received: from joseki.proulx.com ([216.17.153.58]:50914) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRUsg-0001Ce-PC for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:03:42 -0500 Original-Received: from hysteria.proulx.com (hysteria.proulx.com [192.168.230.119]) by joseki.proulx.com (Postfix) with ESMTP id E0CC121832 for ; Fri, 27 Feb 2015 17:03:40 -0700 (MST) Original-Received: by hysteria.proulx.com (Postfix, from userid 1000) id B77CC2DC41; Fri, 27 Feb 2015 17:03:40 -0700 (MST) Mail-Followup-To: help-gnu-emacs@gnu.org Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 216.17.153.58 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:102937 Archived-At: J. David Boyd wrote: > Gregor Zattler writes: > > -;;;### (autoloads nil "rmailsum" "rmailsum.el" "e3943ef45946f10b9b5cab8097d7f271") > > +;;;### (autoloads nil "rmailsum" "rmailsum.el" "e41d88a5c472a084090c2aad1ef4971f") > > Any idea why this happens and what to do aginst this? > > I have the same thing happen occasionally . Like Michael suggested in his response this feels like a bug to me. It isn't reasonable to have things modifying source files all of the time. It would be good to get it reported and fixed. > I just go up a level, mv my 'emacs' to 'emacs.xxx' or something, and reclone > the directory. > > Much faster than trying to figure out why, since I don't care really. Much simpler would be to simply reset and overwrite the "bad" file with the good one. No need to re-clone the entire directory. Re-cloning the entire directory isn't very bandwidth friendly since emacs is quite large. Downloading the entire thing again is rather hard on the upstream vcs.savannah server. (Especially for a few hours before it was compressed when it was 13G! It is now 343M compacted and much more reasonable but that is still large.) Saving that bandwidth is significant. And the entire point of having a distributed version control system. This following will overwrite the current copy of rmail.el with the copy from version control. If that was the only file modified then at that point a subsequent git pull should work since the working copy was then clean and not locally modified. git checkout lisp/mail/rmail.el b/lisp/mail/rmail.el Or alternatively if you want to reset *everything* then use the git reset command to reset everything. git reset --hard Warning! Both of those commands overwrite your local copy of those files. That is what you want in this case. But if I don't include this warning someone will use git reset --hard and then complain that their local changes were destroyed. If I put in this warning then I can say that they were told that was going to happen. Please use version control for the purpose it is intended. You have a clone of the repository. Having that clone means that you already have a way to reset your working copy back to the pristine state. Please don't download the hundreds of megs of data again and again. Think of the kittens! :-) Bob