[Nut-upsdev] Merging the AsciiDoc branch

[Charles Lepple]

On Oct 8, 2009, at 4:13 AM, Arjen de Korte wrote:

> Citeren Charles Lepple <clepple at gmail.com>:
>
>> Another lesson from testing the merge into the trunk: the ChangeLog
>> file will be a mess (since both the trunk and the branch have changes
>> adjacent to each other, most of the revisions conflict with the
>> previous revision). We might want to consider generating the  
>> ChangeLog
>> file from the SVN revision messages.
>
> Considering the latter, I'm all for it. Most of the time, the SVN  
> revision message is duplicated from the ChangeLog anyway (at least,  
> that's what I do). We might just as well automate this, so we only  
> need to fill in the SVN revision message.

And with something like this, we might even be able to match the  
current ChangeLog format:

http://arthurdejong.org/svn2cl/

I think I've seen one or two more variants of this - I will dig them  
up if that's what we want to do.