Difference between revisions of "Scout/Contribution Guidelines"

  ! scope="col" style="background:#efefef;" | Branch

  ! scope="col" style="background:#efefef;" | Branch

  ! scope="col" style="background:#efefef;" | Usage

  ! scope="col" style="background:#efefef;" | Usage

  ! scope="col" style="background:#efefef;" | P2

  ! scope="col" style="background:#efefef;" | P2

  |-

  |-

  | develop

  | 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.

  | 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.

  | http://download.eclipse.org/scout/nightly

  | http://download.eclipse.org/scout/nightly

  |-

  |-

  | master

  | master

  | Contains the sources of the latest stable release.

  | Contains the sources of the latest stable release.

  | http://download.eclipse.org/scout/releases

  | http://download.eclipse.org/scout/releases

  |-

  |-

  | x.y (e.g. ''3.8'')

  | 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.

  | 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.

  | http://download.eclipse.org/scout/x.y

  | http://download.eclipse.org/scout/x.y

  |-

  |-

  | release/<release_name>

  | release/<release_name>

  | Contains the development for the corresponding releases. So e.g. a release branch named ''3.10.1'' 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.

  | Contains the development for the corresponding releases. So e.g. a release branch named ''3.10.1'' 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.

  | http://download.eclipse.org/scout/x.y/x.y.z

  | http://download.eclipse.org/scout/x.y/x.y.z

  |-

  |-

  | features/<developer_user_name>/<feature>

  | features/<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. If multiple developers are working on the same feature, the username of the main responsible is used.

  | 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. If multiple developers are working on the same feature, the username of the main responsible is used.

  | -

  | -

  |-

  |-

  | hotfix/<hotfix_name>

  | 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.

  | 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.

  | -

  | -

  |}

  |}