# HG changeset patch # User Oleksandr Gavenko # Date 1542810715 -7200 # Node ID e920310c8842d011b09b39210a2ad1fafd23f2a7 # Parent 41b2a3652b35c9b628320ab48d491443c91965c8 Updated tag names to use usual "v" prefix. diff -r 41b2a3652b35 -r e920310c8842 devel-proj-branching.rst --- a/devel-proj-branching.rst Thu Nov 15 14:18:37 2018 +0200 +++ b/devel-proj-branching.rst Wed Nov 21 16:31:55 2018 +0200 @@ -102,7 +102,7 @@ +--+------+------+------+------+------+------+------+------+----> dev| | | | | | | | | v v v v v v v v v - 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 + 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 Single development branch with branches for bug fix in major versions. ---------------------------------------------------------------------- @@ -137,15 +137,15 @@ dev| | ^ ^ | | | | | | | | | | | v v v | | | | | | +--+------+------+--> - | | | | | | b2 | | | + | | | | | | v2.x | | | | | | | | | v v v - | | | | | | t2.0.0 t2.0.1 t2.1.0 + | | | | | | v2.0.0 v2.0.1 v2.1.0 v v | | v v - t0.1.0 +---+------+-+---+-+-----+------+------+------+------+---> - b1 | | | | | | | | + v0.1.0 +---+------+-+---+-+-----+------+------+------+------+---> + v1.x | | | | | | | | 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 + v1.0.0 v1.0.1 v1.0.2 v1.1.0 v1.2.0 v1.2.1 v1.2.2 v1.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. +**1.x** as development branch was not ready for production.