tips: devel-proj-branching.rst@4decc3e00bb6 (annotated)

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 6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	3	===========================
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	4	Project branching models.
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	5	===========================
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	6	.. contents::
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	7
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	8	Branch types.
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	9	=============
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	10
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	11	Development branch.
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	12	-------------------
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	13
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	14	* For main development activities.
1025 6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	15	* For bug fixes, small enhancements.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	16	* For development on initial project stage.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	17	* Does not for experimental features!
1019 6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	18
1021 13bf431d9f42 Names Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1020 diff changeset	19	Names: dev, devel, master, trunk
1019 6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	20
1025 6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	21	Feature branch.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	22	---------------
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	23
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	24	* For experimental features.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	25	* For large changes that can break main development.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	26	* For incompatable changes that can break main development.
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	27
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	28	Names: feature-xxx
6d7c8cb191cd Feature branch. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1021 diff changeset	29
1019 6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	30	Release branch.
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	31	---------------
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	32
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	33	* Used to support long running major/minor versions (include bug fixes or
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	34	features backporting).
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	35	* No any new features development.
1020 1ac6ead8a97b Fix spelling. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1019 diff changeset	36	* Release branch created from development branch. Decision about branching come
1ac6ead8a97b Fix spelling. Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1019 diff changeset	37	from release manager after reviewing code quality by QA team.
1019 6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	38	* From release branch you make tags to product releases for customer.
6b9436fefab8 Branch types. Oleksandr Gavenko <gavenkoa@gmail.com> parents: diff changeset	39
1021 13bf431d9f42 Names Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1020 diff changeset	40	Names: vXX.YY.ZZ, maint
13bf431d9f42 Names Oleksandr Gavenko <gavenkoa@gmail.com> parents: 1020 diff changeset	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

author	Oleksandr Gavenko <gavenkoa@gmail.com>
	Fri, 14 Oct 2011 00:48:05 +0300
changeset 1032	4decc3e00bb6
parent 1026	a6f51fcdb6f2
child 1049	a1e7d8884936
permissions	-rw-r--r--