Re: When do we merge the commits from emacs-25 onto master?

[Eli Zaretskii]

> From: David Engster <address@hidden>
> Cc: Eli Zaretskii <address@hidden>,  address@hidden,  address@hidden
> Date: Wed, 25 Nov 2015 01:35:44 +0100
> 
> Paul Eggert writes:
> > 1. make change-history
> >
> > 2. Now ChangeLog.3 is up-to-date.  Merge emacs-25 into the master;
> > this updates ChangeLog.2 without changing ChangeLog.3.
> >
> > 3. Now ChangeLog.2 is up-to-date, but 'make change-history' would
> > screw up ChangeLog.3.  Prevent this screwup by editing ChangeLog.3 to
> > say that it records revisions to the current master commit
> > (inclusive).
> >
> > Easy, huh?  :-)
> 
> So in the end, you have ChangeLog.2 and ChangeLog.3 in master which are
> tracking changes from different branches in parallel, i.e., for the same
> time span. Isn't that a problem?

We won't release from master, so the problem is not so significant, I
think.

When branching, we might need to do something about that, but that's a
rare event.