| author | Oleksandr Gavenko <gavenkoa@gmail.com> |
| Fri, 21 Oct 2011 13:05:51 +0300 | |
| changeset 1054 | 1718aa7d99bc |
| parent 1049 | a1e7d8884936 |
| child 1055 | 120af6ca4d58 |
| 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 |
||
| 1021 | 40 |
Names: vXX.YY.ZZ, maint |
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 |