| author | Oleksandr Gavenko <gavenkoa@gmail.com> |
| Fri, 21 Oct 2011 15:40:16 +0300 | |
| changeset 1060 | 3d6440915224 |
| parent 1055 | 120af6ca4d58 |
| child 1061 | 4c3c9b4f8d73 |
| permissions | -rw-r--r-- |
|
1032
4decc3e00bb6
Fix coding and contents.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1026
diff
changeset
|
1 |
.. -*- coding: utf-8 -*- |
|
4decc3e00bb6
Fix coding and contents.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1026
diff
changeset
|
2 |
|
| 1019 | 3 |
=========================== |
4 |
Project branching models. |
|
5 |
=========================== |
|
6 |
.. contents:: |
|
7 |
||
8 |
Branch types. |
|
9 |
============= |
|
10 |
||
11 |
Development branch. |
|
12 |
------------------- |
|
13 |
||
14 |
* For main development activities. |
|
| 1025 | 15 |
* For bug fixes, small enhancements. |
16 |
* For development on initial project stage. |
|
17 |
* Does not for experimental features! |
|
| 1019 | 18 |
|
| 1049 | 19 |
Names: dev, devel, master, trunk, default |
| 1019 | 20 |
|
| 1025 | 21 |
Feature branch. |
22 |
--------------- |
|
23 |
||
| 1049 | 24 |
* For experimental features, that can be striped. |
| 1025 | 25 |
* For large changes that can break main development. |
26 |
* For incompatable changes that can break main development. |
|
27 |
||
28 |
Names: feature-xxx |
|
29 |
||
| 1019 | 30 |
Release branch. |
31 |
--------------- |
|
32 |
||
33 |
* Used to support long running major/minor versions (include bug fixes or |
|
34 |
features backporting). |
|
35 |
* No any new features development. |
|
| 1020 | 36 |
* Release branch created from development branch. Decision about branching come |
37 |
from release manager after reviewing code quality by QA team. |
|
| 1019 | 38 |
* From release branch you make tags to product releases for customer. |
39 |
||
| 1055 | 40 |
Names: vXX.YY.ZZ, maint, stable |
| 1021 | 41 |
|
| 1054 | 42 |
Custom branches. |
43 |
---------------- |
|
44 |
||
45 |
Custom branches intended to store modification to main release to make custom |
|
46 |
product build. |
|
47 |
||
48 |
Don't use custom branches at all. Instead redesign project to use customizable |
|
49 |
build. Expected problem: |
|
50 |
||
51 |
* You must manually propagate bug fixed to all custom branches. |
|
52 |
* It is not possible merge custom branches back to development branch. |
|
53 |
||
|
1026
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
54 |
Workflows. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
55 |
========== |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
56 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
57 |
Regular development workflow. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
58 |
----------------------------- |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
59 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
60 |
Regular development stay in development or feature branches. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
61 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
62 |
After completing feature set and testing feature branch merged with top of main |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
63 |
development branch tested again and merged to main development branch. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
64 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
65 |
After completing feature set and testing main development branch merged to |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
66 |
release branch. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
67 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
68 |
Bug fixing workflow. |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
69 |
-------------------- |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
70 |
|
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
71 |
TODO |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
72 |
|
|
1060
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
73 |
Single line workflow. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
74 |
--------------------- |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
75 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
76 |
* Only single development branch exist. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
77 |
* Release means finish developing set of features and bug fixes on branches and |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
78 |
moving product build to release server.. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
79 |
* After testing and stabilising release was made. This means: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
80 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
81 |
* VERSION file was updated. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
82 |
* CHANGE file was filled with feature set, version, data and VCS revision |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
83 |
number. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
84 |
* Mark release by tag in VCS. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
85 |
* Invoke build of sources which marked by tag. Copy result to release server. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
86 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
87 |
* If bug discovered in some version, it fixed at development branch and |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
88 |
released with new minor/fix product version. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
89 |
* Previous major/minor releases do not supported (just use latest release). |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
90 |
Users always forced to update to latest release. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
91 |
* Each new release placed in hierarchy:: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
92 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
93 |
/vendor/product/XX.YY.ZZ/* |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
94 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
95 |
and symlinked to:: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
96 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
97 |
/vendor/product/latest/ |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
98 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
99 |
Example of release timeline:: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
100 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
101 |
+--+------+------+------+------+------+------+------+------+----> |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
102 |
dev| | | | | | | | | |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
103 |
v v v v v v v v v |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
104 |
t0.1.0 t1.0.0 t1.0.1 t1.1.0 t1.1.1 t1.1.2 t1.2.0 t2.0.0 t2.1.0 |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
105 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
106 |
Single development branch with branches for bug fix in major versions. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
107 |
---------------------------------------------------------------------- |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
108 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
109 |
* Each major release have **own** branch. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
110 |
* Another single branch reserved for development. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
111 |
* Latest major relase branch is active. All older major branches is passive. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
112 |
* Passive major branches was used for **only** for minor bug fixes on latest |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
113 |
code from this major version series (no new features). |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
114 |
* Features developed in development branch. Before release in merged to active |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
115 |
major release branch. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
116 |
* Bug was fixed in oldest major version branch for which it must be provided |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
117 |
and merged to all next major version branches and development branch. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
118 |
* Release means finish developing set of features and bug fixes on branches and |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
119 |
moving product build to release server.. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
120 |
* After testing and stabilising release was made. This means: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
121 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
122 |
* VERSION file was updated. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
123 |
* CHANGE file was filled with feature set, version, data and VCS revision |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
124 |
number. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
125 |
* Mark release by tag in VCS. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
126 |
* Invoke build of sources which marked by tag. Copy result to release server. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
127 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
128 |
* If bug discovered in some version, it fixed at development branch and |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
129 |
released with new minor/fix product version. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
130 |
* Previous major/minor releases do not supported (just use latest release). |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
131 |
Users always forced to update to latest release. |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
132 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
133 |
Example of release timeline:: |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
134 |
|
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
135 |
+--+-----+--------+------+------+----+------+------+-----> |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
136 |
dev| | | | | | | | |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
137 |
| | | | | v v v |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
138 |
| | | | | +--+------+------+--> |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
139 |
| | | | | b2 | | | |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
140 |
| | | | | v v v |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
141 |
| | | | | t2.0.0 t2.0.1 t2.1.0 |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
142 |
v v v v v |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
143 |
t0.1.0 +---+------+------+------+------+------+------+---> |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
144 |
b1 | | | | | | | |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
145 |
v v v v v v v |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
146 |
t1.0.0 t1.0.1 t1.1.0 t1.2.0 t1.2.1 t1.2.2 t1.2.3 |
|
3d6440915224
Single development branch with branches for bug fix in major versions.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1055
diff
changeset
|
147 |