Re: make change-history on non-master branches

[Andreas Schwab]

Eli Zaretskii <address@hidden> writes:

>> 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?

I don't know, but I would be surprised if it could handle that
correctly.

Andreas.

-- 
Andreas Schwab, SUSE Labs, address@hidden
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."