You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/11/08 10:57:35 UTC

svn commit: r1539962 - in /incubator/marmotta/site/trunk/content: markdown/development.md resources/css/site.css resources/images/gitflow-workflow.png

Author: wikier
Date: Fri Nov  8 09:57:35 2013
New Revision: 1539962

URL: http://svn.apache.org/r1539962
Log:
improved gitflow documentation

Added:
    incubator/marmotta/site/trunk/content/resources/images/gitflow-workflow.png   (with props)
Modified:
    incubator/marmotta/site/trunk/content/markdown/development.md
    incubator/marmotta/site/trunk/content/resources/css/site.css

Modified: incubator/marmotta/site/trunk/content/markdown/development.md
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/markdown/development.md?rev=1539962&r1=1539961&r2=1539962&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/markdown/development.md (original)
+++ incubator/marmotta/site/trunk/content/markdown/development.md Fri Nov  8 09:57:35 2013
@@ -1,3 +1,5 @@
+<head><title>Development</title></head> <!-- awaiting for https://jira.codehaus.org/browse/DOXIA-472 -->
+
 # Development
 
 Here you can find the development related issues when working with the Apache 
@@ -49,19 +51,21 @@ Where:
 * `libraries` agroups some libraries that can also be used independently to build Linked Data applications.
 * `platform` contains the Linked Data Platform implementation of Apache Marmotta.
 
-Marmotta is using [Apache Maven](http://maven.apache.org) as its build system, check out how to
-[build it from the source code](installation.html#src). 
+![gitflow](images/gitflow-workflow.png)
 
-Marmotta uses a [branching workflow](http://git-scm.com/book/en/Git-Branching-Branching-Workflows) 
-depicted by the following diagram:
+[Apache Maven](http://maven.apache.org) is used as integrated build system; check out how to
+[build Marmotta from the source code](installation.html#src). 
 
-![branching workflow followed by Marmotta](images/git-branching-workflow.png)
+Marmotta uses a [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/) 
+([read more](http://www.atlassian.com/git/workflows#!workflow-gitflow)), depicted by the diagram
+on the right, which uses the following framework:
 
-Where we have a stable `master` branch and a unstable `develop` branch. Besides, optionally `topic` 
-branches could be open for some topics/issues, which don't necessarily need to be pushed to the public 
-repository.
+* Instead of a single `master` branch, we are using two branches to record the history of the project: the `master` branch stores the official release history, and the `develop` branch serves as an integration  branch for features. The whole project development works around the distinction between these two branches.
+* New features could optionally open feature branches for some topics/issues, which are typically identified with the issue key from our issue tracker (`MARMOTTA-XYZ`). 
+* In addition, maintenance or hotfix branches (`maintenance-3.0.x` for instance) are also used to quickly patch production releases without interrupting the current development cycle.
 
-The code of this web site is also available, via [Subversion](http://subversion.apache.org/) in this case:
+Besides the actual code of the project, the code of this web site is also available, via 
+[Subversion](http://subversion.apache.org/) in this case:
 
     svn:https://svn.apache.org/repos/asf/incubator/marmotta/site/trunk
 

Modified: incubator/marmotta/site/trunk/content/resources/css/site.css
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/resources/css/site.css?rev=1539962&r1=1539961&r2=1539962&view=diff
==============================================================================
--- incubator/marmotta/site/trunk/content/resources/css/site.css (original)
+++ incubator/marmotta/site/trunk/content/resources/css/site.css Fri Nov  8 09:57:35 2013
@@ -231,3 +231,8 @@ p#banner iframe {
     height: 20px;
 }
 
+img[alt=gitflow] {
+    float: right; 
+    clear: right;
+}
+

Added: incubator/marmotta/site/trunk/content/resources/images/gitflow-workflow.png
URL: http://svn.apache.org/viewvc/incubator/marmotta/site/trunk/content/resources/images/gitflow-workflow.png?rev=1539962&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/marmotta/site/trunk/content/resources/images/gitflow-workflow.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream