Re: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?)

[Eli Zaretskii]

> From: Artur Malabarba <address@hidden>
> Date: Tue, 24 Nov 2015 14:25:19 +0000
> Cc: David Engster <address@hidden>
> 
> David Engster <address@hidden> writes:
> 
> > We still haven't figured out how to deal with the generated ChangeLogs,
> > so I'm not sure we should merge at the moment.
> 
> Could you elaborate on what the issue is?

They were described in the discussion starting here:

  http://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01461.html

> I thought if we just generated the changelogs independently for each of
> the branches we would be fine (i.e., don't merge to master the changelog
> commits on emacs-25).

We could do that, but then the manual corrections to ChangeLog.2 made
on the branch would have to be done again, manually, on master.