Hey guys, How about this:
Any commit that should end up in the changelog is tagged, using for example "@changelog" or maybe using git-notes, and then using a separate gem (Which I can develop if you all agree on this solution), that parses git-log between two tags and include any commit having the tag even if it's a revert, except if the commit is both tagged and reverted (a change that was tagged but was reverted for some reason), at the end generate a changeLog file with the desired formatting... Using something like this, you can just remove the changelog from all branches and never worry about forgetting or back-porting an entry. 1) Tag the new version 2) Run *<gem>* old_version new_version 3) Include the ChangeLog with his release annoucement The only problem I can foresee for this solution is current commits, they won't have any tags, but this can be easily fixed using git-notes, just annotate any commit that should be included with an @changelog note. Thoughts? On Thu, Nov 17, 2011 at 23:50, Aaron Patterson <[email protected]>wrote: > On Thu, Nov 17, 2011 at 10:30:13PM +0000, Jon Leighton wrote: > > Jon fixes a bug in master. It's a minor thing and not hugely relevant to > > the 3.2.0 release, so there is no changelog entry. > > > > SCENE 3 > > > > Jon backports the fix to 3-1-stable. It's more relevant there as it will > > feature in the forthcoming point release. So the changelog is updated: > > You can't for sure know that you'll backport from master to 3-1-stable. > Also, if you do port to 3-1-stable and someone reverts, now your > changelog entry is lost. I think this suffers exactly the same > problems I mentioned in the original post. > > -- > Aaron Patterson > http://tenderlovemaking.com/ > -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Waêl Nasreddine TechnoGate www.technogate.fr mobile : 06.41.68.38.35 agence : 09.70.444.236 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- You received this message because you are subscribed to the Google Groups "Ruby on Rails: Core" 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/rubyonrails-core?hl=en.
