devel-proj-branching.rst
author Oleksandr Gavenko <gavenkoa@gmail.com>
Tue, 11 Oct 2011 23:05:41 +0300
changeset 1023 d8c88154a28f
parent 1021 13bf431d9f42
child 1025 6d7c8cb191cd
permissions -rw-r--r--
Find greatest common ancestor of the two changesets.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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.
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    13
 * Usually for bug fixes, small enhancements.
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    14
 * Also for development if project on initial development stage.
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    15
1021
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 1020
diff changeset
    16
Names: dev, devel, master, trunk
1019
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    17
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    18
Release branch.
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    19
---------------
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    20
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    21
 * Used to support long running major/minor versions (include bug fixes or
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    22
   features backporting).
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    23
 * No any new features development.
1020
1ac6ead8a97b Fix spelling.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 1019
diff changeset
    24
 * Release branch created from development branch. Decision about branching come
1ac6ead8a97b Fix spelling.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 1019
diff changeset
    25
   from release manager after reviewing code quality by QA team.
1019
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    26
 * From release branch you make tags to product releases for customer.
6b9436fefab8 Branch types.
Oleksandr Gavenko <gavenkoa@gmail.com>
parents:
diff changeset
    27
1021
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 1020
diff changeset
    28
Names: vXX.YY.ZZ, maint
Oleksandr Gavenko <gavenkoa@gmail.com>
parents: 1020
diff changeset
    29