Changes between Version 3 and Version 4 of SourceCodeGit/WorkFlow


Ignore:
Timestamp:
Aug 7, 2012, 11:47:58 AM (12 years ago)
Author:
davea
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • SourceCodeGit/WorkFlow

    v3 v4  
    88== Branches ==
    99
    10 dev = server development
     10master = development (currently trunk)
    1111
    12 master = server stable
     12server_stable
    1313
    14 dev_client = client development
    15 
    16 master_client = client stable
     14client_release_major_minor = release major.minor
    1715
    1816== Initial state after migration ==
    1917
    20 master forked to dev
     18copy trunk to master
    2119
    22 master forked to dev_client
     20copy server_stable to server_stable
    2321
    24 dev_client forked to master_client
     22create client_release_X_X as needed
    2523
    26 == Client Development ==
     24== Local repositories ==
    2725
    28 Bug fixes and new simple features start out in dev_client and are merged to master_client when needed.
     26Developers can create feature branches
     27or separate server and client branches in their local repositories.
    2928
    30 (if feature branches are used) fork dev_client to client_XXX where XXX is the feature name. Do work in client_XXX until complete. Merge completed feature into dev_client.
     29== Development ==
     30
     31All new code goes into master.
     32
     33Hot fixes get merged into server_stable and/or client_release_X_X if needed.
    3134
    3235=== Release Process ===
    33 
    34 Dev builds (odd minor version) are built out of the dev_client branch. Tags (boinc_client_release_X_XX_XX) are created when the build number is incremented.
    35 
    36 Release builds (even minor version) are built out of the master_client branch. Tags (boinc_client_release_X_XX_XX) are created when the build number is incremented.
    37 
    38 master_client is forked to boinc_client_release_X_XX when a new dev_client release is considered stable.  Any future bug fixes for the X_XX release are handled in its branch.
    39 
    40 Mass merge of outstading commits from dev_client to master_client. Increment minor version number.
    41 
    42 == Current Unknowns ==
    43 
    44 Can git merge a 'lib' change from dev to dev_client?  How about the other way?