[Top][All Lists]

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

Re: Is it time to drop ChangeLogs?

From: Eli Zaretskii
Subject: Re: Is it time to drop ChangeLogs?
Date: Fri, 11 Mar 2016 22:04:27 +0200

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

> The same applies here, you have to cherry-pick both the original commit
> and the later one that created the "overwrite file" in the
> "commit-msg-override" directory.

I hoped for some post-commit hook that could do that automatically, or
at least suggest that another commit needs to be picked.

reply via email to

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