[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: make change-history on non-master branches
From: |
Eli Zaretskii |
Subject: |
Re: make change-history on non-master branches |
Date: |
Wed, 18 Nov 2015 20:19:10 +0200 |
> From: Glenn Morris <address@hidden>
> Cc: address@hidden, address@hidden
> Date: Wed, 18 Nov 2015 13:10:11 -0500
>
> Eli Zaretskii wrote:
>
> >> And the resulting ChangeLog.2 entries (and more importantly, any
> >> corrections) will have to be merged to master, just like in the old days?
> >
> > Maybe I'm missing something, but why do we have to merge it? Won't
> > "make change-history" create on each branch the file that branch
> > wants?
> >
> > If we can avoid merging, we could teach gitmerge.el skip that file.
>
> The issue is the hand-written corrections.
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?
- make change-history on non-master branches, Glenn Morris, 2015/11/16
- Re: make change-history on non-master branches, Paul Eggert, 2015/11/16
- Re: make change-history on non-master branches, Eli Zaretskii, 2015/11/16
- Re: make change-history on non-master branches, Glenn Morris, 2015/11/18
- Re: make change-history on non-master branches,
Eli Zaretskii <=
- Re: make change-history on non-master branches, Glenn Morris, 2015/11/18
- Re: make change-history on non-master branches, Eli Zaretskii, 2015/11/18
- Re: make change-history on non-master branches, David Kastrup, 2015/11/18
- Re: make change-history on non-master branches, Andreas Schwab, 2015/11/19
- Re: make change-history on non-master branches, Eli Zaretskii, 2015/11/19
- Re: make change-history on non-master branches, Andreas Schwab, 2015/11/19
- Re: make change-history on non-master branches, Eli Zaretskii, 2015/11/19
- Re: make change-history on non-master branches, David Engster, 2015/11/19
- Re: make change-history on non-master branches, Eli Zaretskii, 2015/11/19
- Re: make change-history on non-master branches, David Engster, 2015/11/19