equal
deleted
inserted
replaced
100 Example of release timeline:: |
100 Example of release timeline:: |
101 |
101 |
102 +--+------+------+------+------+------+------+------+------+----> |
102 +--+------+------+------+------+------+------+------+------+----> |
103 dev| | | | | | | | | |
103 dev| | | | | | | | | |
104 v v v v v v v v v |
104 v v v v v v v v v |
105 t0.1.0 t1.0.0 t1.0.1 t1.1.0 t1.1.1 t1.1.2 t1.2.0 t2.0.0 t2.1.0 |
105 v0.1.0 v1.0.0 v1.0.1 v1.1.0 v1.1.1 v1.1.2 v1.2.0 v2.0.0 v2.1.0 |
106 |
106 |
107 Single development branch with branches for bug fix in major versions. |
107 Single development branch with branches for bug fix in major versions. |
108 ---------------------------------------------------------------------- |
108 ---------------------------------------------------------------------- |
109 |
109 |
110 * Each major release have **own** branch. |
110 * Each major release have **own** branch. |
135 |
135 |
136 +--+-----+----------------------+-----+----+------+------+-----> |
136 +--+-----+----------------------+-----+----+------+------+-----> |
137 dev| | ^ ^ | | | | | |
137 dev| | ^ ^ | | | | | |
138 | | | | | | v v v |
138 | | | | | | v v v |
139 | | | | | | +--+------+------+--> |
139 | | | | | | +--+------+------+--> |
140 | | | | | | b2 | | | |
140 | | | | | | v2.x | | | |
141 | | | | | | v v v |
141 | | | | | | v v v |
142 | | | | | | t2.0.0 t2.0.1 t2.1.0 |
142 | | | | | | v2.0.0 v2.0.1 v2.1.0 |
143 v v | | v v |
143 v v | | v v |
144 t0.1.0 +---+------+-+---+-+-----+------+------+------+------+---> |
144 v0.1.0 +---+------+-+---+-+-----+------+------+------+------+---> |
145 b1 | | | | | | | | |
145 v1.x | | | | | | | | |
146 v v v v v v v v |
146 v v v v v v v v |
147 t1.0.0 t1.0.1 t1.0.2 t1.1.0 t1.2.0 t1.2.1 t1.2.2 t1.2.3 |
147 v1.0.0 v1.0.1 v1.0.2 v1.1.0 v1.2.0 v1.2.1 v1.2.2 v1.2.3 |
148 |
148 |
149 In this example we release tags **1.0.1** and **1.0.2** with bug fixes in branch |
149 In this example we release tags **1.0.1** and **1.0.2** with bug fixes in branch |
150 **1** as development branch was not ready for production. |
150 **1.x** as development branch was not ready for production. |
151 |
151 |