# HG changeset patch # User Oleksandr Gavenko # Date 1318373704 -10800 # Node ID a6f51fcdb6f2341aa2f37883e76f237ed6b21319 # Parent 6d7c8cb191cd05ee101be3acc0779b778bae2fc8 Regular development workflow. diff -r 6d7c8cb191cd -r a6f51fcdb6f2 devel-proj-branching.rst --- a/devel-proj-branching.rst Wed Oct 12 01:50:26 2011 +0300 +++ b/devel-proj-branching.rst Wed Oct 12 01:55:04 2011 +0300 @@ -37,3 +37,22 @@ Names: vXX.YY.ZZ, maint +Workflows. +========== + +Regular development workflow. +----------------------------- + +Regular development stay in development or feature branches. + +After completing feature set and testing feature branch merged with top of main +development branch tested again and merged to main development branch. + +After completing feature set and testing main development branch merged to +release branch. + +Bug fixing workflow. +-------------------- + +TODO +