Issue #1638 has been updated by jamtur01. Status changed from Unreviewed to Accepted Assigned to set to jamtur01 Target version set to unplanned
---------------------------------------- Refactor #1638: Generate CHANGELOG file at release time to minimize conflicts when merging (and save extra typing) http://projects.reductivelabs.com/issues/show/1638 Author: tmz Status: Accepted Priority: Normal Assigned to: jamtur01 Category: plumbing Target version: unplanned As "discussed":http://groups.google.com/group/puppet-dev/msg/3bd474abe7558e65?hl=en on puppet-dev[1], generating the CHANGELOG at release time instead of editing it along with each commit should help minimize the frequent conflicts it causes when merging and applying patches. The thread linked below has a few ideas for how to achieve this, but help on integrating this with puppet's release process is still needed. I'd be happy to try and help with this, though I don't know my way around the puppet release process and rake much (yet). Here's a short example of one way to achieve this that I suggested in the puppet-dev thread: <pre> > Say we update CHANGELOG only at release time, then the previous > release tag would be in the first line and could be used. Some > pseudo/sh code as an example: > > # somewhere in the bowels of the puppet release process... > # ...in a galaxy far, far away... > # > # have this passed in to the Rakefile or pulled from a version string > # in the source somewhere? > cur_rel=0.24.6 > prev_rel=$(head -1 CHANGELOG) > > # update the CHANGELOG > echo $cur_rel > CHANGELOG.tmp > git log --pretty=format:' %s%n' $prev_rel..$cur_rel >> CHANGELOG.tmp > echo "" >> CHANGELOG.tmp > cat CHANGELOG>> CHANGELOG.tmp > mv CHANGELOG.tmp CHANGELOG </pre> According to "DevelopmentLifecycle":http://reductivelabs.com/trac/puppet/wiki/DevelopmentLifecycle#building-releases the release we'd be building is passed into rake as REL, so that answers my question about how to determine the release. The DevelopmentLifecycle page also says that the rake command needs to be run on laeg. Is there a (documented) way for me to test this locally so I can see about whipping up a patch? [1] http://groups.google.com/group/puppet-dev/msg/3bd474abe7558e65?hl=en ---------------------------------------- You have received this notification because you have either subscribed to it, or are involved in it. To change your notification preferences, please click here: http://reductivelabs.com/redmine/my/account --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/puppet-bugs?hl=en -~----------~----~----~----~------~----~------~--~---
