Re: CVS branching - Git branching model

2012-01-31 Thread Hallvard B Furuseth
I wrote: - Some sort of 'devel' branch, branched off 'maint' and current 'master', merging 'maint' after releases. Like to today's 'master' but without unfinished features other than code behind #ifdef LDAP_DEVEL. That way it can be merged into maint now and then (like before a

Re: CVS branching - Git branching model

2012-01-31 Thread Hallvard Breien Furuseth
Quanah Gibson-Mount wrote: --On Tuesday, January 31, 2012 12:11 PM +0100 Hallvard Breien Furuseth h.b.furus...@usit.uio.no wrote: I think we should leave the current CVS-style branching model and make better use of Git. 'master' is currently two things: The development branch, and

Re: CVS branching - Git branching model

2012-01-31 Thread Quanah Gibson-Mount
--On Tuesday, January 31, 2012 11:59 PM +0100 Hallvard Breien Furuseth h.b.furus...@usit.uio.no wrote: Quanah Gibson-Mount wrote: --On Tuesday, January 31, 2012 12:11 PM +0100 Hallvard Breien Furuseth h.b.furus...@usit.uio.no wrote: I think we should leave the current CVS-style