On Wed, Nov 2, 2011 at 1:57 PM, Brian Wightman wrote: > On Tue, Nov 1, 2011 at 10:17 AM, Eric Schulte > wrote: > > This is also after all the development repository, and while I do try > > very hard never to break this head of this repository at the same time I > > think it is an acceptable place to try out new functionality. > > Given that a common recommendation for a bug fix is to 'try commit > blah blah blah', would it make sense to have bug fixes go onto a > 'maint' branch (as well as master), and new features / changed > features stay on the master branch? At the time when 'master' is > ready for a new official release, it could then be merged into 'maint' > to create the next stable point for bug fixes. > > Adding features on the same branch as bug fixes, when 'official > releases' are not made frequently seems to be a formula for > frustration. > Added features are not that much of a problem, but changes which affect backward compatibility are. But there were not many in the past that I am aware of. Cheers, Rainer > Thoughts? > > Brian > > -- Rainer M. Krug, PhD (Conservation Ecology, SUN), MSc (Conservation Biology, UCT), Dipl. Phys. (Germany) Centre of Excellence for Invasion Biology Stellenbosch University South Africa Tel : +33 - (0)9 53 10 27 44 Cell: +33 - (0)6 85 62 59 98 Fax (F): +33 - (0)9 58 10 27 44 Fax (D): +49 - (0)3 21 21 25 22 44 email: Rainer@krugs.de Skype: RMkrug