Changes between Version 6 and Version 7 of SuperProjectWorkflow

Timestamp:

Jan 18, 2014, 4:30:33 PM (9 years ago)

Author:

Daniel James

Comment:

Release branches are branched from develop in git flow.

SuperProjectWorkflow

@@ -28 +28 @@
 === Release preparation ===
 
-The release preparation branch follows the Git Flow model. It is branched from "master" and deleted once the release is complete. Branching occurs immediately after each final release.
+The release preparation branch follows the Git Flow model. It is branched from "develop" and merged with "release" once complete.
 
 When a submodule does a release, the super-project's "develop" for the submodule is updated to the new version, and merged (without committing) to the release branch. Release management scripts then run local tests.
@@ -46 +46 @@
 Test runners test release branch, "develop", and "latest", in sequence.
 
- The intent is to move to an environment where regression tests of a library's development or release branch can be run against the "master" branch of all other libraries. As we develop that ability, regression testing will evolve a great deal.
+The intent is to move to an environment where regression tests of a library's development or release branch can be run against the "master" branch of all other libraries. As we develop that ability, regression testing will evolve a great deal.
 
 == Changes from original proposal ==
 
 * Branch "release/n.n.n" explicitly named.
-* Releases branched from "master", per Git Flow.
 
 == Open questions ==
 
 * Would release management and regression testing scripts be simpler if the name of the release development branch was fixed (e.g. "release") rather than varying (e.g. "release/1.56.0")?
+
 
 == Naming rationale ==