Changes between Version 3 and Version 4 of SourceCodeGit/WorkFlow

Timestamp:

Aug 7, 2012, 11:47:58 AM (12 years ago)

Author:

davea

Comment:

--

SourceCodeGit/WorkFlow

@@ -8 +8 @@
 == Branches ==
 
-dev = server development
+master = development (currently trunk)
 
-master = server stable
+server_stable
 
-dev_client = client development
-
-master_client = client stable
+client_release_major_minor = release major.minor
 
 == Initial state after migration ==
 
-master forked to dev
+copy trunk to master
 
-master forked to dev_client
+copy server_stable to server_stable
 
-dev_client forked to master_client
+create client_release_X_X as needed
 
-== Client Development ==
+== Local repositories ==
 
-Bug fixes and new simple features start out in dev_client and are merged to master_client when needed.
+Developers can create feature branches
+or separate server and client branches in their local repositories.
 
-(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.
+== Development ==
+
+All new code goes into master.
+
+Hot fixes get merged into server_stable and/or client_release_X_X if needed.
 
 === Release Process ===
-
-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.
-
-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.
-
-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.
-
-Mass merge of outstading commits from dev_client to master_client. Increment minor version number.
-
-== Current Unknowns ==
-
-Can git merge a 'lib' change from dev to dev_client?  How about the other way?