Skip to main content

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

Difference between revisions of "Scout/Contribution Guidelines"

(Git Branching Policy)
(Git Branching Policy)
Line 18: Line 18:
 
  |-
 
  |-
 
  | master
 
  | master
  | Contains the sources of the latest stable release. This is equal to the sources for the features found in the P2 updatesite http://download.eclipse.org/scout/releases
+
  | Contains the sources of the latest stable release. This is equal to the sources for the features found in the P2 updatesite http://download.eclipse.org/scout/releases.
 +
|-
 +
| x.y (e.g. 3.8)
 +
| Version branches containing the sources for the corresponding Scout version. These branches exist as long as the corresponding version of Scout is still supported and releases containing bugfixes are shipped.
 
  |-
 
  |-
 
  | release/<release_name>
 
  | release/<release_name>

Revision as of 09:05, 12 June 2013

The Scout documentation has been moved to https://eclipsescout.github.io/.

Introduction

TODO

Git Branching Policy

The following table describes the branching policy used for the Eclipse Scout Git Repositories (http://git.eclipse.org/c/scout/).

Branch Usage
develop Contains the very latest sources. This branch is used for building the nightly version and contains the development of the newest features that usually will be available to the next stable release.
master Contains the sources of the latest stable release. This is equal to the sources for the features found in the P2 updatesite http://download.eclipse.org/scout/releases.
x.y (e.g. 3.8) Version branches containing the sources for the corresponding Scout version. These branches exist as long as the corresponding version of Scout is still supported and releases containing bugfixes are shipped.
release/<release_name> Contains the development for the corresponding releases. So e.g. a release branch named luna_sr1 contains the fixes for the Luna service release 1. These branches will be merged into the origin branch (the branch from where the release branch has been created) and develop branch as soon as the corresponding release is shipped. Afterwards the branch is deleted and the merge into the origin branch is tagged.
sandbox/<developer_user_name>/<feature> Contains developer private feature branches that contain the developments of new features. As soon as the feature development is complete, this branch is merged into the develop branch and the feature branch is deleted.
hotfix/<hotfix_name> Contains branches in which hotfixes for a release are developed. After the hotfix development is complete, the hotfix branch is merged into the develop and the origin branch (the branch from where the hotfix branch has been created). Then the origin branch is tagged and the hotfix branch is deleted.

Git Repositories and current Branches

Please see http://wiki.eclipse.org/Scout/Contribution#Getting_the_Scout_Sources.

Back to the top