[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: make change-history
|
From: |
Eli Zaretskii |
|
Subject: |
Re: make change-history |
|
Date: |
Sun, 29 Jul 2018 21:18:25 +0300 |
> From: Paul Eggert <address@hidden>
> Date: Sun, 29 Jul 2018 11:10:49 -0700
>
> Ken Brown wrote:
>
> > $ make change-history
> > git branch | grep -q '^\* emacs-26$'
> > make: *** [Makefile:1125: preferred-branch-is-current] Error 1
> >
>
> I'd change PREFERRED_BRANCH_IS_CURRENT in the master's Makefile. Apparently
> nobody has bothered to do this since emacs-26 forked from master.
Aren't we supposed to run "make change-history" only on the release
branch, to avoid conflicts when merging?