My 2 cents.... > > Proposals: > > 1. Stop using topic branches for new development, use the master for this
Normal development (safe features/bug fixes/etc) should be done on master. The master should be mostly stable which means quick, tested patches. Riskier features such as experimental changes should be done on topic style branches. > 2. Rename the maintenance branch to match the actual version it covers (2.0.x) Yes. It should also be highlighted that tags are used to determine stable versions. This is a challenge with the bindings as they all have different approaches. The core may be stable, but the bindings may/may not. Because the bindings tie so closely to the core, it causes some problems. > 3. Start a new maintenance branch for 2.1.x so that patches can be > applied to 2.1.x releases This should be done when 2.1.x is at the end of the development cycle and 2.2.x is the new master. > 4. Use github pull requests instead of email patches Might as well use the tool for what its good for... Joshua > > Justification: > > 1. Putting new code onto the master ensures it gets into daily builds > and is tested by those of us who work on master > 2. The current 'maint' branch concept is both too abstract (you need > to investigate to see what version it refers to) and insufficient > (excludes multiple maintenance branches) > 3. Adding a maint branch for 2.1.x (and for each minor version in > future) allows contributors to make patches on _any_ released version > 4. Using github pull requests ensures that patches do not get lost, > can be commented on, etc. > > Of course any maintenance branch needs a maintainer; if the process > for maintaining and testing a branch is easy (which it must become > IMO) then that is not a burden. > > Cheers > -Pieter > _______________________________________________ > zeromq-dev mailing list > zeromq-dev@lists.zeromq.org > http://lists.zeromq.org/mailman/listinfo/zeromq-dev _______________________________________________ zeromq-dev mailing list zeromq-dev@lists.zeromq.org http://lists.zeromq.org/mailman/listinfo/zeromq-dev
