[Nut-upsdev] Merging the AsciiDoc branch

Arjen de Korte nut+devel at de-korte.org
Thu Oct 8 08:13:58 UTC 2009


Citeren Charles Lepple <clepple op 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.

Best regards, Arjen
-- 
Please keep list traffic on the list




More information about the Nut-upsdev mailing list