From: Glenn Morris <rgm@gnu.org>
To: help-gnu-emacs@gnu.org
Subject: Re: git:
Date: Fri, 27 Feb 2015 19:24:11 -0500 [thread overview]
Message-ID: <r7385qx4r8.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <87mw3zgdcj.fsf@web.de> (Michael Heerdegen's message of "Sat, 28 Feb 2015 00:10:36 +0100")
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).
next prev parent reply other threads:[~2015-02-28 0:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 22:24 git: Gregor Zattler
2015-02-27 15:08 ` git: J. David Boyd
2015-02-28 0:03 ` git: Bob Proulx
2015-02-27 23:10 ` git: Michael Heerdegen
2015-02-27 23:57 ` git: Gregor Zattler
2015-02-28 0:24 ` Glenn Morris [this message]
2015-02-28 0:30 ` git: Glenn Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=r7385qx4r8.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.