# HG changeset patch # User Oleksandr Gavenko # Date 1319201677 -10800 # Node ID 4c3c9b4f8d7362123eabdec768f19980bae65db9 # Parent 3d6440915224434a74cbe5eeaf6b94f57001c4c4 Show bug fixes in branches. diff -r 3d6440915224 -r 4c3c9b4f8d73 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. +