Re: merging emacs-24

[Ted Zlatanov]

On Thu, 27 Nov 2014 08:02:12 -0500 Ted Zlatanov <address@hidden> wrote: 

TZ> On Wed, 26 Nov 2014 22:48:12 -0500 Glenn Morris <address@hidden> wrote: 
GM> The ChangeLogs don't look right. All merged new entries should have gone
GM> to the top (this was trivial with bzr's changelog-merge plugin, probably
GM> git has something similar) and got today's date.

TZ> I used the recommended gnulib driver:

TZ> [merge "merge-changelog"]
TZ>         name = GNU-style ChangeLog merge driver
TZ>         driver = /usr/local/bin/git-merge-changelog %O %A %B

I'm not sure if this means that `git-merge-changelog' doesn't work the
way the Emacs maintainers want, or that I used it incorrectly. Hints
welcome. Most importantly, I need to know if I leave this in my
gitconfig but try to use gitmerge.el, the result will be bad from the
maintainers' perspective.

Ted