Changes between Version 8 and Version 9 of BranchingPolicy


Ignore:
Timestamp:
03/15/11 18:58:42 (3 years ago)
Author:
dread
Comment:

Agreed to allow single changeset tickets not branched.

Legend:

Unmodified
Added
Removed
Modified

  • BranchingPolicy

    v8 v9  
    1111  * metastable: (will soon be deprecated) for code preparing to be stable 
    1212  * default: development HEAD 
    13  2. A (named) branch will be created for each feature or defect (bug). Naming convention: 
     13 2. A (named) branch will be created for each feature or defect (bug), unless it is almost certain that the ticket only requires one changeset. 
     14  Branch naming convention: 
    1415  * defect-{ticket-number}[-optional-name] e.g. defect-902-my-bad-bug 
    1516  * feature-{ticket-number}[-optional-name] e.g. feature-903-my-amazing-feature 
    … …  
    1819Feature, bug and release branches may be "closed" once appropriately merged. To summarize the work-flow: 
    1920 
    20  * No (or almost no) work should be done in default or stable directly. Work in branches. 
     21 * Almost no work should be done in default or stable directly - only tickets requiring single changesets area allowed. Otherwise work in branches. 
    2122 * feature branches branch off default and merge back into default 
    2223 * defect branches branch off default *or* stable and merge back into respective branches. Fixes on stable get merged to default as appropriate.