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

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

author	Oleksandr Gavenko <gavenkoa@gmail.com>
	Wed, 12 Oct 2011 01:55:04 +0300
changeset 1026	a6f51fcdb6f2
parent 1025	6d7c8cb191cd
child 1032	4decc3e00bb6
permissions	-rw-r--r--