[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Is it time to drop ChangeLogs?

From: Nikolaus Rath
Subject: Re: Is it time to drop ChangeLogs?
Date: Fri, 11 Mar 2016 12:08:09 -0800
User-agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.4 (gnu/linux)

Hi Eli,

Please do not Cc me on replies, I am reading the list.

On Mar 11 2016, Eli Zaretskii <address@hidden> wrote:
>> From: Nikolaus Rath <address@hidden>
>> Date: Fri, 11 Mar 2016 11:53:32 -0800
>> > This solution should also support merging from the release branch to
>> > master and cherry-picks in the opposite direction, where (AFAIK) SHA1
>> > checksum is not necessarily left intact.
>> I don't think *any* solution can support cherry-picks without extra
>> manual work. Even if you keep the ChangeLog file under version control
>> and edit it by hand, you have to cherry-pick the original commit plus
>> the later commit that updated the ChangeLog.
> ChangeLog is updated in the same commit as the code, so cherry-picking
> brings them both to the other branch.  Or maybe I misunderstand what
> you mean by "the later commit"?

We are talking about the case were the ChangeLog entry / original commit
message was incorrect and need to be corrected later (in the "later


GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F
Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F

             »Time flies like an arrow, fruit flies like a Banana.«

reply via email to

[Prev in Thread] Current Thread [Next in Thread]