Re: ChangeLog and the release branch

emacs-devel

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

Re: ChangeLog and the release branch

From:	Dmitry Gutov
Subject:	Re: ChangeLog and the release branch
Date:	Tue, 24 Nov 2015 15:29:30 +0200
User-agent:	Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0

On 11/24/2015 04:25 PM, Artur Malabarba wrote:

I thought if we just generated the changelogs independently for each of
the branches we would be fine (i.e., don't merge to master the changelog
commits on emacs-25).

I suppose gitmerge.el could try and ignore ChangeLog.2. But then anyedits we make to the commit messages by changing ChangeLog.2 in emacs-25branch, will be discarded with it.

[Prev in Thread]

Current Thread

[Next in Thread]

When do we merge the commits from emacs-25 onto master?, Artur Malabarba, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, Eli Zaretskii, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, Paul Eggert, 2015/11/23
  - Re: When do we merge the commits from emacs-25 onto master?, Artur Malabarba, 2015/11/23
    - Re: When do we merge the commits from emacs-25 onto master?, David Engster, 2015/11/23
    - ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?), Artur Malabarba, 2015/11/24
    - Re: ChangeLog and the release branch, Dmitry Gutov <=
    - Re: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?), Eli Zaretskii, 2015/11/24
    - Re: ChangeLog and the release branch, Yagnesh Raghava Yakkala, 2015/11/26
    - Re: ChangeLog and the release branch, Eli Zaretskii, 2015/11/27
    - Re: ChangeLog and the release branch, David Engster, 2015/11/28
    - Re: ChangeLog and the release branch, Eli Zaretskii, 2015/11/28
    - Re: ChangeLog and the release branch, David Engster, 2015/11/28
    - Re: ChangeLog and the release branch, John Wiegley, 2015/11/28
    - Re: When do we merge the commits from emacs-25 onto master?, Eli Zaretskii, 2015/11/24
    - Re: When do we merge the commits from emacs-25 onto master?, David Engster, 2015/11/24
    - Re: When do we merge the commits from emacs-25 onto master?, Paul Eggert, 2015/11/24

Prev by Date: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?)
Next by Date: RE: Q: text-quoting-style -- is its value a string or a symbol?
Previous by thread: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?)
Next by thread: Re: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?)
Index(es):
- Date
- Thread