author | Oleksandr Gavenko <gavenkoa@gmail.com> |
Sun, 23 Oct 2011 20:21:29 +0300 | |
changeset 1048 | 409aab81f818 |
parent 1032 | 4decc3e00bb6 |
child 1049 | a1e7d8884936 |
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 |
|
1021 | 19 |
Names: dev, devel, master, trunk |
1019 | 20 |
|
1025 | 21 |
Feature branch. |
22 |
--------------- |
|
23 |
||
24 |
* For experimental features. |
|
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 |
||
1026
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
42 |
Workflows. |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
43 |
========== |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
44 |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
45 |
Regular development workflow. |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
46 |
----------------------------- |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
47 |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
48 |
Regular development stay in development or feature branches. |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
49 |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
50 |
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
|
51 |
development branch tested again and merged to main development branch. |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
52 |
|
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
53 |
After completing feature set and testing main development branch merged to |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
54 |
release branch. |
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 |
Bug fixing workflow. |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
57 |
-------------------- |
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 |
TODO |
a6f51fcdb6f2
Regular development workflow.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
1025
diff
changeset
|
60 |