Re: CEDET Merge

[Paul Eggert]

David Engster wrote:
> Yes, that's a problem with long-living feature branches. It'd be nice if
> 'make ChangeLog' would use the commit date of the merge commit for all
> commits that entered Emacs through a branch merge.

As I understand it, that's not easy since git does not prefer one branch to the 
other in a merge, so any scheme we come up with will be as likely to redate 
commits already in the master as to redate commits entering through the merge.

> If that isn't easily possible, the person who does the merge could do a
> filter-branch before merging, setting GIT_COMMITTER_DATE to the current
> date

Something like that should work. We aren't doing that now, which causes problems 
like the confusion noted.

> (if 'make ChangeLog' would actually use the committer date, which
> AFAICS it currently does not).

gitlog-to-changelog uses %ct, not %at, for its 'git log' format, so 'make 
ChangeLog' should already be using committer date.