Re: make change-history on non-master branches

[Eli Zaretskii]

> From: Andreas Schwab <address@hidden>
> Cc: Glenn Morris <address@hidden>,  address@hidden,  address@hidden
> Date: Thu, 19 Nov 2015 09:35:50 +0100
> 
> Eli Zaretskii <address@hidden> writes:
> 
> >> From: Glenn Morris <address@hidden>
> >> Cc: address@hidden,  address@hidden
> >> Date: Wed, 18 Nov 2015 13:28:08 -0500
> >> 
> >> Eli Zaretskii wrote:
> >> 
> >> > Right.  But if we merge ChangeLog.2 from the release branch to master,
> >> > then this will produce a mess when "make change-history" is run on
> >> > master, no?  I mean, some entries will appear twice, once after
> >> > corrections, the other without.  No?
> >> 
> >> Quite possibly. I don't know exactly what happens if the commit hash
> >> from the ChangeLog.2 footer were to get merged between branches.
> 
> You get a merge conflict.

Even if I have git-merge-changelog installed?

> > Perhaps Git gurus could help us out?  Andreas, any suggestions?
> 
> You need to resolve the merge conflict one way or the other.

Thanks.  Maybe we could get some help from gitmerge.el, even if that
would require some specific pattern in the log messages of commits
that correct ChangeLog.2.  David, WDYT?