User Tools

Site Tools


devel:roadmap

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
devel:roadmap [2017-03-20 14:23]
skyjake [Branches]
devel:roadmap [2018-12-12 18:43]
skyjake [Work branches]
Line 37: Line 37:
  
  
-The primary branch is called **master**. All builds are made from it automatically on a (usually) biweekly schedule by the [[automated build system]]. This means that all development in the master branch must be atomic enough so that the branch remains releasable at any given moment. Other branches should be used for working on new features until they are ready for merging into the master. Bug fixing should be done in the master branch so that the fixes are released immediately. //(Team members ​should take extra care of fixing bugs on the correct branch!)//+The primary branch is called **master**. All builds are made from it automatically on a (usually) biweekly schedule by the [[automated build system]]. This means that all development in the master branch must be atomic enough so that the branch remains releasable at any given moment. Other branches should be used for working on new features until they are ready for merging into the master. Bug fixing should be done in the master branch so that the fixes are released immediately. //(Contributors ​should take extra care of fixing bugs on the correct branch!)//
  
 Another important branch is the **stable** branch that is reserved for stable releases. It can be used for applying patches to the latest stable release. Another important branch is the **stable** branch that is reserved for stable releases. It can be used for applying patches to the latest stable release.
- 
- 
-==== Work branches ==== 
- 
- 
-We are using two kinds of work branches. 
-  *  **Alternative masters**: branched from master, these are used for working on a particular (large) feature. Progress is merged back to master in small chunks over time, after which work continues in the branch. Due to the merges and the interwoven history, these branches are essentially alternative master branches that will eventually all converge back to the true master. 
-  *  **Offshoots**:​ prefixed with "​work/",​ these branches are for longer-term/​experimental work that may not end up in the master. These branches should be rebased on the master to keep them up-to-date, and eventually cherry-picked into the master if deemed useful. This way the contained changesets have a clean history. An offshoot branch could also be cherry-picked into some alternative master and then merged later to the true master. As the "​work/"​ branches may be replaced/​rebased at any time, they are best used as private work areas rather than for collaboration. 
  
  
  
devel/roadmap.txt · Last modified: 2018-12-12 18:43 by skyjake