switched several-release diagram to the version from Harvey Chapman.
diff --git a/2012-09-03-Mo-hg-branching-diagrams.org b/2012-09-03-Mo-hg-branching-diagrams.org
--- a/2012-09-03-Mo-hg-branching-diagrams.org
+++ b/2012-09-03-Mo-hg-branching-diagrams.org
@@ -49,7 +49,7 @@ Diagrams for the hg branching strategy
* Maintain several releases side-by-side
#+begin_src ditaa :file hgbranchingmaintain.png
-
+
| |
programmers | maintainers maintainers | users
| |
@@ -69,22 +69,34 @@ Diagrams for the hg branching strategy
| | \-----------/ | |
| | | |
| | | |
- | | /------------------\ | |
- | | |maintained release| | |
- | | \-----+------------/ | cBLU |
+ | | /----------------------\ | |
+ | | |maintained release 1.x+-=--| |
+ | | \-----------+----------/ | cBLU |
+----------------+ | | | | |
| |<---+ | : | |
| feature branch | | cGRE | v | |
| {d} | | {d} | /-----------\ | {d} |
- +----+------+----+ | | |hotfix cRED+-=-merge-->| |
- : | | | \-------+---/or | |
- | | | | |or | |
+ +----+------+----+ | | |hotfix cRED| | |
+ : | | | \-------+---/ | |
+ | | | | | | |
+ | | | | : | |
+ | | | | v | |
+ | | | | /-------------------\ | |
+ | | | | |release tag 1.(x+1)| | |
+ | | | | \----------+--------/ | |
+ | | | | | | |
| | | | merge | |
| | | | : | |
| | | | v | |
- | | | | /------------------\ | |
- | | | | |maintained release+-=-merge->| |
- | | | | \------------------/ | cBLU |
+ | | | | /----------------------\ | |
+ | | | | |maintained release 2.y| | |
+ | | | | \-----------+----------/ | cBLU |
+ | | | | | | |
+ | | | | : | |
+ | | | | v | |
+ | | | | /-------------------\ | |
+ | | | | |release tag 2.(y+1)+-=-merge->| |
+ | | | | \-------------------/ | |
| | | | ... | |
| | | | | |
| +-merge-->| |<--------merge hotfix-----------+ |