SHARE
TWEET

Untitled

a guest Jul 24th, 2019 68 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. [begin work on 0.4 branch]
  2.        |
  3.        |
  4.        v              
  5. (*)---(*)-------(a)--(b)---(c)-- <-- Trunk is "unstable".
  6.                 |          |        Contains all commits.
  7.     ver      [merge from trunk]     Developers commit to trunk.
  8. <-- 0.3         v          v
  9.             +---(a)--------(c)-- <-- Branch is "stable".
  10.                                      Contains selected commits from trunk.
  11.                                      Know beforehand what's going onto branch.
  12.      
  13. [trunk]
  14. (*)---(*)---(*)----------------------------[development continues]--->
  15.  
  16.  
  17. [0.4 branch]                        No further development on branch unless
  18. (*)---(*)---(*)---[0.4-release]     spot fixes are needed. Then re-tag (0.4.1)
  19.                           ^         and re-release.
  20.                           |        
  21.                           |
  22.                        [make tag on branch; release from stable branch,
  23.                         not unstable trunk]
  24.      
  25. - Project
  26.     |-  development mainline
  27.     |-  TAG: version-1.0
  28.          |- version-1.0-bugfix#123
  29.          |- version-1.0-bugfixes
  30.     |-  TAG: version-1.0-sp1
  31.          |- version-1.0-sp1-bugfix#234
  32.          |- version-1.0.sp1-bugfixes
  33.     |-  TAG: version-1.0-sp2
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top