Access to add and change pages is restricted. See: https://cwiki.apache.org/confluence/display/OFBIZ/Wiki+access

  • Created by Unknown User (swapnilmmane), last updated on May 01, 2019 2 minute read

You are viewing an old version of this page. View the current version.

Compare with Current View Page History

« Previous Version 7 Next »

The OFBiz community decides to migrate the code repository from Subversion (SVN) to Git, here is the communication thread.

This document contain all the details to migrate the code repository from SVN to Git and the workflow/processes to be adopted by community.


Code Repository

We already have read-only Git mirrors for the OFBiz Subversion repository. There are two mirrors, before release16.11 and another is after the release16.11.
Since we separate the framework and plugins after release16.11.


release16.11 and previous releases

https://github.com/apache/ofbiz/


Trunk and releases after 16.11

Framework - https://github.com/apache/ofbiz-framework/

Plugins - https://github.com/apache/ofbiz-plugins


  • Communicate with ASF Infra team to enable write access in the above repositories.
  • After successful migration to Git, mark the SVN repository as read-only

Workflow

As nicely explained by Taher Alkhateeb in the mail thread, here details on workflow.

The contribution workflow for small features / bug fixes and and large features.

Small Features / Bug Fixes

Small features follow the exact same workflow that currently exists in SVN.

You do your work, diff it, and attach the patch to a JIRA and request a commit from one of the committers.

Large Features

For large features usually multiple people need to collaborate on a separate branch. Here is where git shines and the distributed model kicks in:
1. A JIRA is created for a large feature.
2. The team (not necessarily having a committer) creates a remote repository which itself may have many branches with the master branch having all the work agreed upon and merged (actually, rebased)
3. The collaboration for this branch happens in the JIRA including discussions, comments, and even links to the commits etc ...
4. A request is made to a committer to make a pull request from the repository after reaching a certain milestone with consensus from the community of course.
5. Here, for extra safety, the branch model may have a trunk and a develop branches. Everything is pulled to the develop branch and trickles down to the master branch after thorough and proper testing.

The above workflow can also adhere to the now famous Vincent Driessen git branching model found here -> http://nvie.com/posts/a-successful-git-branching-model/


[Swapnil M Mane] - Recently (29 April 2019) the Apache® Software Foundation Expands Infrastructure with GitHub Integration. This will allow projects to use GitHub's excellent tools.

https://blogs.apache.org/foundation/entry/the-apache-software-foundation-expands






  • No labels