This Confluence has been LDAP enabled, if you are an ASF Committer, please use your LDAP Credentials to login. Any problems file an INFRA jira ticket please.

Page tree

Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Update SVN -> GIT + assorted typos

This document is intended to capture some of the policies we would like all committers to follow when it comes to checking in changes into our SVN tree GIT repository.

Commit Log Format

Each commit to the repository must have a non-empty log message. The message format should start with a one-line short summary prefixed with the Jira issue number. If you do not have a Jira issue number, create one before you commit. The short summary need not be a complete sentence with proper punctuation and grammar since it is best to keep it to 72 characters or less.

...

In the future, I'd like to see the need for listing the operating systems tested on go away when we implement a testing environment that can accept pre-commit patch and verify that patch passes a series of smoke tests.

Commits that resolve a Jira ticket should also include an update to the CHANGES file - just add the full commit 'short summary' line and an attribution if relevant (to make it easier to view version content). Commits to this file should preserve double blank lines where they exist.

Trunk

Trunk is CTR, Commit-Then-Review, policy. This was discussed and voted on by the community a long time ago. This does grant a lof lot of freedom to committing experimental or unstable code to the trunk. However, with such powers, comes some responsibilities:

  1. If the trunk is broken, i.e. it doesn't build and/or run even without your changes, please don't commit! No more fuel on the fire please. It should be relatively easy to track down which change set broke the build from the trunk buildbot dashboard and inform the committer or community.
  2. You are responsible for latest trunk to build and at least start up on one of our supported platforms with your changes before you commit to SVN, on one of our supported platformspush a commit. This typically implies that you should to do an `svn up` a `git pull` to your tree and build before committing. Running the regression tests (trunk/ci/regression) is also highly recommended.
  3. At a minimum the the build should not break on the current primary buildbot slave which is Ubuntu Linux. If the primary build bot is broken, it is the commiter's responsibility to get the build working or find someone to help them.
  4. If your changes result in a non-functioning Traffic Server (e.g. start fails, simple forward proxy browsing is broken, etc) please consider backing out your changes and submitting the changes for review under a TS Jira ticket and asking for reviewers.
  5. If your changes are so large that you want to make partial commits, create a SVN branch or work on a local repository using a version control system like Git or Mercurial. Several of the developers in the community use Git and hg, and can provide help and tips on how to use it.

Release Branches

All release branches (e.g. 2.0.x, 3.2.X) should always be kept in a stable and functional state. The commit policy is RTC, Review Then Commit, and backporting changes from trunk should be voted on via the STATUS file on the respective branches.