Hi all,
up to now, we used the following development approach:
- develop on the main branch
- every time a new release comes out, make a XYZ_FIX branch
- make fixes on XYZ_FIX branch
- continue development on the main branch
and we are comfortable with this. Now, we would like to use this
approach:
- stable branches even numbered (2.2, 2.4, 2.6, ...)
- development branches odd numbered (2.1, 2.3, 2.5, ...)
Stable releases could be easily put into branches and fixes will go
to them. The main trunk could be used for the latest development
branch.
I know there are other projects which use a similar approach. What I
don't know is how they manage stable and development branches.
One option could be to keep the latest stable version on the main trunk,
have a development branch and then port all changes to the main trunk
to make a new release. This has the advantage of selecting only some
features to port (the one that are stable enough): developers could play
adding new features and then the decision is made to port them to the
main trunk or not. This approach is simply not feasible to me, but maybe
I'm missing something.
Any ideas?
Cheers,
Andrea