[Kde-pim] Re: Opening kdepim master for feature commits, branching kdepim 4.6

[Torgny Nyblom]

On Friday 22 April 2011 12.22.48 Christophe Giboudeaux wrote:
> On Thursday 21 April 2011 17:32:27 Allen Winter wrote:
> > What about the following:
> > - branch kdepim4/.6 and kdepim-runtime/4.6
> > - open kdepim/master and kdepim-runtime/master for new features,
> > strings,
> > etc - bug fixes are backported to the 4.6 branches
> > 
> > i.e. the normal situation.
> > 
> > If/when we make a KDEPIM4.6 release, I will use the 4.6 branches.  no
> > problem at all.
> > 
> > I just need to coordinate with the translators if we want to do this.
> > 
> > Any objections?

None, but I propose that master should use the kernel style branching below.

> That sounds a bit late for branching considering that the soft-feature
> freeze will happen in 6 days and we still have no idea whether kdepim 4.6
> will ever be released.
> 
> Before reopening kdepim, I believe we should answer Kevin's question about
> the commit strategy/policy in kdepim: develop in master & cherry-pick in
> branch (svn style) or develop new features in staging branches and merge
> them into master when new features become mature (kernel style)

1 vote for kernel style, ie master should always be in a releaseable state

/Torgny	
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/