Source Code Management modified by W. Eliot Kimber

W. Eliot Kimber — Mon, 07 Apr 2014 20:05:02 -0000

--- v1
+++ v2
@@ -5,8 +5,8 @@

 The following branches are maintained in the public repository:

-* released - Released code: reflects the latest *published* version of the code for the default OT version (1.7 as of April 2014). It should be identical to the OT-version-specific branch (since they're for the same OT version). The released branch should only reflect code that has passed all regression tests.
-* released-OTn.n - Released code specific to the corresponding DITA Open Toolkit version, e.g. released-OT1.8 for the 1.8 version of the OT.
+* release - Released code: reflects the latest *published* version of the code for the default OT version (1.7 as of April 2014). It should be identical to the OT-version-specific branch (since they're for the same OT version). The released branch should only reflect code that has passed all regression tests.
+* release-OTn.n - Released code specific to the corresponding DITA Open Toolkit version, e.g. release-OT1.8 for the 1.8 version of the OT.
 * rc - The release candidate branch for the default OT version. This branch reflects release candidate code, meaning code that has passed local dev tests but is still undergoing full regression tests. The RC branches are used by the D4P Jenkins server to automate regression testing. Any commits pushed to an RC branch will trigger the D4P regression for that branch.
 * rc-OTn.n - The release candidate branch for the corresponding Open Toolkit version, e.g. rc-OT1.8 is for the 1.8 version of the OT (this naming convention presumes we'll only ever support the latest release of a given OT version.

Source Code Management modified by W. Eliot Kimber

W. Eliot Kimber — Mon, 07 Apr 2014 19:50:16 -0000

As of March 2014, the DITA for Publishers project uses the project's git repository for managing all source code. The SVN repository is retained for historical purposes only--the git repository should reflect all the history from the SVN repository.

Branch Organization

The following branches are maintained in the public repository:

released - Released code: reflects the latest published version of the code for the default OT version (1.7 as of April 2014). It should be identical to the OT-version-specific branch (since they're for the same OT version). The released branch should only reflect code that has passed all regression tests.
released-OTn.n - Released code specific to the corresponding DITA Open Toolkit version, e.g. released-OT1.8 for the 1.8 version of the OT.
rc - The release candidate branch for the default OT version. This branch reflects release candidate code, meaning code that has passed local dev tests but is still undergoing full regression tests. The RC branches are used by the D4P Jenkins server to automate regression testing. Any commits pushed to an RC branch will trigger the D4P regression for that branch.
rc-OTn.n - The release candidate branch for the corresponding Open Toolkit version, e.g. rc-OT1.8 is for the 1.8 version of the OT (this naming convention presumes we'll only ever support the latest release of a given OT version.

As of April 2014, there is only active development for the 0.9.19 version of D4P, currently on Release Candidate 12. At some point in the future we will start on version 1.0. At that time we'll branch the 0.9.19 code into its own tree and make 1.0 the mainline branch.

Local Development Practice

For local development, please create feature branches and either provide pull requests to SourceForge or push your changes to the appropriate RC branch. If we need to collaborate on a more involved development project we can always create public feature branches.

Recent changes to Source Code Management

Source Code Management modified by W. Eliot Kimber

Source Code Management modified by W. Eliot Kimber

Branch Organization

Local Development Practice