Re: CEDET Merge

[Eli Zaretskii]

> Cc: Glenn Morris <address@hidden>, address@hidden, address@hidden,
>  address@hidden, address@hidden, address@hidden
> From: Paul Eggert <address@hidden>
> Date: Sat, 21 Jan 2017 14:57:58 -0800
> 
> >> If you want a recent example of this, "make ChangeLog" and look at the
> >> dates of "recent" concurrency entries. Some are years old.
> > That doesn't mean we should drop the rule, just that some people are
> > not always following rules.
> 
> I guess I'm not following this. For example, commit 
> 470e3028d8a741d97349faa8fdeb148d913a49d0 ("Fix the MS-Windows build") has a 
> commit date of 2015-11-02 19:04:06 2015 +0200, and so "make ChangeLog" dates 
> it 
> 2015-11-02. And yet this commit was merged into master on 2016-12-10, by you, 
> as 
> part of merge commit 2412a1fc05fe9f89b171d0781c2d530923f48adc ("Support 
> concurrency in Emacs Lisp"). So when you say "some people are not always 
> following rules", do you mean that you did this particular merge incorrectly? 
> Or 
> am I not understanding the rules?

Commit 2412a1f has its own log message (something unusual for merge
commits, AFAIK), so IMO this example exactly follows the rules as I
understand them.