[Development] dist/changes-x.y.z (was: Re: Branches)

Olivier Goffart olivier at woboq.com
Thu Dec 6 19:08:41 CET 2012


On Thursday 06 December 2012 17:58:57 shane.kearns at accenture.com wrote:
> > Hi Lars,
> > 
> > On Monday December 3 2012, Knoll Lars wrote:
> > > Dev:
> > > 
> > > Dev is the branch where you can land anything that's supposed to go
> > > into 5.1. The following policies apply:
> > > 
> > > * Changes have to be source and binary compatible
> > > * You can add new method and classes given that they are fully
> > > documented and tested * Please do not add half finished features.
> > > Create your own branch for that, and only push your changes once the
> > 
> > feature is fully done.
> > 
> > Should we add:
> > 
> > * carries a change to dist/changes-5.1.0 if it's (Qt-)user-visible (bug
> > fixes,
> > 
> >   new features, performance fixes)?
> > 
> > Same for stable once 5.0.0 branches off?
> 
> This would cause many more staging conflicts, as most changes would touch
> the same file. I'd suggest that bug fixes should not touch the changes
> file, only new features.

I suggest we add a new header in our commit messages such as "Changelog:" 
Someting that can be parsed to generate the changelog automatically.

-- 
Olivier

Woboq - Qt services and support - http://woboq.com




More information about the Development mailing list