RFC: updated workflow [WAS: Re: git+patch workflow]

[Patrick Winnertz]

Am Montag 05 Januar 2009 15:13:48 schrieb Enrico Weigelt:
> * Oswald Buddenhagen <ossi at kde.org> schrieb:
>
> Hi,
>
> > delete *the* stable branch, but not the concept of stable branches
> > per se. doing so would mean that once you merged a feature patch
> > to master, you cannot do a bugfix release any more until you make
> > a feature release (*). to keep the option of bugfix releases open
>
> Actually, I dislike that idea. Instead we should declare, that
> 'master' branch is *always* what becomes the next release. We just
> have to take care that it's always in a state that it could be
> released ASAP - so: *no* development there. New features only get
> committed if they're really ready to get into next release (which
> in theory could come any second).
Well.. I like the idea of mc-4.6 stable branch quite much as we can then do 
point releases there which is only bugfixing and do active development in 
master on e.g. utf8 support or.. or or... 
This has this advantage:
 - we release mc-4.6.2 from mc-4.6 branch
Tested utf8 very much and include it in master
 - there is now a smaller issue but we doesn't want to release e.g .4.7 (with 
utf8) yet
 --> make a pointrelease with that fix applied and work further on master

With your scenario we have troubles here, because we can't make a smaller 
point release fixing only some bugs without introducing new big features which 
should be reserved for a new bigger release.

Fixes done in mc-4.6 branches can then be merged back into master so that 
master contains always every patch. 

I hope that this sound logically for you and I we can work this way :)

Greetings
Winnie

-- 
 . '' ` .   Patrick Winnertz <winnie at debian.org>
:  :'   :   proud Debian developer, author, administrator, and user
`. `'`     http://people.debian.org/~winnie - http://www.der-winnie.de
  `-  Debian - when you have better things to do than fixing systems
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.midnight-commander.org/pipermail/mc-devel/attachments/20090105/7225905f/attachment.asc>