Branches

Trunk is always the latest and greatest branch of code. This is equivalent to the community version.

Branches are in the svn repository, under the /opsview/branches area. We use this for major development work.

Enterprise branches of Opsview are under /opsview/branches/enterprise. Enterprise branches are restricted access.

Major development work is done in its own branch and then merged in when ready.

Other changes are made first in trunk. Confirm that the daily builds, the continuous integration and the install servers are working with changes.

If appropriate, merge the changes into other branches. Should merge only single commits.

There are 4 levels of changes:

• bug fix - this should be fixed in the trunk, tested and merged into appropriate branches. These can go into Enterprise editions
• new features - this should only be done in trunk
• low risk enhancements - this can be done in trunk, tested and merged into appropriate branches. (TODO: more examples and clearer definition of allowed enhancements)
• high risk enhancements - only done in trunk

1. Make change in trunk. Update CHANGES file
2. Apply change to any other branches if applicable. Update CHANGES file. Cut a release if necessary