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

Compare with Current View Page History

« Previous Version 27 Next »

Note

This document is a work in progress

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.

Commit Log Format

TS-#### short summary (72 chars or less), not a sentence

Tested: Platform e.g. Ubuntu-9.0.4, OSX (10.5), FreeBSD (7.2), OpenSolaris (osol096)

More detailed explanatory text as necessary, patch attributions, and
what platforms the commit has been tested on.  Wrap it to about 72
characters or so.  In some contexts, the first line is treated as the
subject of an email and the rest of the text as the body.  The blank
line separating the summary from the body is critical (unless you omit
the body entirely); tools like rebase can get confused if you run the
two together.

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 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
  2. You are responsible for latest trunk to build and at least start up with your changes before you commit to SVN, on one of our supported platforms. This typically implies that you should to do an `svn up` to your tree and build before committing.
  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) 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.

  • No labels