Hi all,

> On Wed, Oct 08 2014 at 11:34:26 AM, Werner LEMBERG <w...@gnu.org> wrote:
>>> Also, how will we proceed when we will consider that this automake
>>> migration is ready for merge into master?  The normal process would
>>> be to squash all the commits into a single one on master, but given
>>> the high number of files impacted, it might be better to have all
>>> the commits into master?  In this case should I need to add a entry
>>> in ChangeLog per commit on automake3?
>>
>> IMHO, your changes are too large for a detailed ChangeLog entry.
>> Instead, I recommend that you simply merge your branch back into
>> master, leaving your single commits intact.  The merge should be
>> accompanied with a ChangeLog entry that gives an overview of what the
>> commits in the branch do.
>
> OK, I'll tell you when automake3 is ready.

I've just fully rebased `automake3', and I think it is nearly ready to
be merged into master.  A few things to do:

 - I still need to write and commit a ChangeLog entry.  Because
   automake3 was rebased there will be no merge commit when I'll merge
   it into master so I need to commit it on automake3 first.

 - An entry in `NEWS' should also be added.

 - I've written a short explanation of the use of automake in
   doc/automake.mom that is not automatically generated.


Regards,

--
Bertrand Garrigues

Reply via email to