Show bug fixes in branches.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 21 Oct 2011 15:54:37 +0300
changeset 1061 4c3c9b4f8d73
parent 1060 3d6440915224
child 1062 169365bd08fd
child 1063 fdc5ed189bd3
Show bug fixes in branches.
devel-proj-branching.rst
--- a/devel-proj-branching.rst	Fri Oct 21 15:40:16 2011 +0300
+++ b/devel-proj-branching.rst	Fri Oct 21 15:54:37 2011 +0300
@@ -132,16 +132,19 @@
 
 Example of release timeline::
 
-  +--+-----+--------+------+------+----+------+------+----->
-  dev|     |        |      |      |    |      |      |
-     |     |        |      |      |    v      v      v
-     |     |        |      |      |    +--+------+------+-->
-     |     |        |      |      |    b2 |      |      |
-     |     |        |      |      |       v      v      v
-     |     |        |      |      |      t2.0.0 t2.0.1 t2.1.0
-     v     v        v      v      v
-    t0.1.0 +---+------+------+------+------+------+------+--->
-           b1  |      |      |      |      |      |      |
-               v      v      v      v      v      v      v
-              t1.0.0 t1.0.1 t1.1.0 t1.2.0 t1.2.1 t1.2.2 t1.2.3
+  +--+-----+----------------------+-----+----+------+------+----->
+  dev|     |            ^     ^   |     |    |      |      |
+     |     |            |     |   |     |    v      v      v
+     |     |            |     |   |     |    +--+------+------+-->
+     |     |            |     |   |     |    b2 |      |      |
+     |     |            |     |   |     |       v      v      v
+     |     |            |     |   |     |      t2.0.0 t2.0.1 t2.1.0
+     v     v            |     |   v     v
+    t0.1.0 +---+------+-+---+-+-----+------+------+------+------+--->
+           b1  |      |     |       |      |      |      |      |
+               v      v     v       v      v      v      v      v
+              t1.0.0 t1.0.1 t1.0.2 t1.1.0 t1.2.0 t1.2.1 t1.2.2 t1.2.3
 
+In this example we release tags **1.0.1** and **1.0.2** with bug fixes in branch
+**1** as development branch was not ready for production.
+