Tree Rules for the 1.8 Branch
As mentioned previously, Firefox 2 development is happening on the 1.8 branch. A branch plan is being implemented in which certain frontend directories (mozilla/browser and parts of mozilla/toolkit) will be automatically mirrored between the trunk and the 1.8 branch. Support for code #ifdef MOZILLA_1_8_BRANCH has been introduced to deal with divergence in mirrored directories between the trunk and the 1.8 branch.
For directories that are not automatically mirrored between trunk and branch, the following 1.8 branch tree rules are in effect:
- Module owners and peers are responsible for deciding which patches are acceptable to land on the 1.8 branch, using the guidelines below.
- A bugzilla flag branch-1.8.1 has been created. To nominate a patch for acceptance on the 1.8 branch, set this flag and request approval from the appropriate module owner.
- The approval1.8.1 flag is for use during freeze periods.
The following guidelines should be used by module owners to decide which patches should be accepted on the 1.8 branch:
- The fix must not alter any XPCOM interfaces or pseudo-interfaces which shipped with Firefox 1.5 or Thunderbird 1.5;
- Fixes to backend code should be tested and verified on the trunk and any regressions must be fixed;
- Fixes to backend code should be fixes for regressions, crashes, unexpected behavior, and features needed for Firefox 2. Landing of other new features should be proposed to and approved by drivers@mozilla.org via email.
Update: the 1.8 branch tag in CVS is MOZILLA_1_8_BRANCH. Please add the fixed1.8.1 keyword to bugs after they have been checked in on this branch.