From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.help Subject: Re: git: Date: Fri, 27 Feb 2015 19:24:11 -0500 Message-ID: References: <20150226222407.GA18239@boo.workgroup> <87mw3zgdcj.fsf@web.de> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1425083073 3930 80.91.229.3 (28 Feb 2015 00:24:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 28 Feb 2015 00:24:33 +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:24:33 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 1YRVCq-0007k9-LZ for geh-help-gnu-emacs@m.gmane.org; Sat, 28 Feb 2015 01:24:32 +0100 Original-Received: from localhost ([::1]:39527 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVCp-0001pP-Vj for geh-help-gnu-emacs@m.gmane.org; Fri, 27 Feb 2015 19:24:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVCX-0001lN-Cj for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:24:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRVCW-00087j-Gb for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:24:13 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:50291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRVCW-00087f-E2 for help-gnu-emacs@gnu.org; Fri, 27 Feb 2015 19:24:12 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YRVCW-0003tu-24; Fri, 27 Feb 2015 19:24:12 -0500 X-Spook: Reno LABLINK ASO virus secure strategic Merlin bank X-Ran: }ZO,4t"ka`&AkY24hY'?=I.T;dV"LH9nJ9/klkJhV'SOd]S~uOoQQV^amBqAiTK;kF&96R X-Hue: black X-Attribution: GM In-Reply-To: <87mw3zgdcj.fsf@web.de> (Michael Heerdegen's message of "Sat, 28 Feb 2015 00:10:36 +0100") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:102938 Archived-At: Michael Heerdegen wrote: > The hash in the diff is an md5 checksum generated by > `autoload-generate-file-autoloads'. I'm not sure why the md5 hashes > differ, but this happened to me too. Because the autoload source file, rmailsum.el, got modified. The autoload hashes are updated once a day by a cron job that checks in a new rmail.el (etc). If you happen to build before that runs, then git pull after, you might see this issue. > I suggest to make a bug report please [...] I disagree. It's been like this for many years and is behaving as designed. It's a shame git is less user-friendly (refusing to pull if you have uncommitted changs, even if the changes are identical to what you want to pull) than eg bzr or svn, which just do the sensible thing (pull and resolve conflicts automatically where possible).