Edgewall Software

Trac Development Sandbox

As we like to keep our development version (a.k.a. trunk​) clean and always fully functional (minus the bugs), we try to implement functionally disruptive changes in branches first.

Branch Categories

There are basically two kinds of branches in our sandbox:

  1. short-lived branches: branches that concern a small set of functionality, that is better reviewed and refined as a branch than as a patch
    • it should be a no-brainer to start this kind of branch, at the developer's discretion
    • merge back in trunk should be a no-brainer too, when one thinks that branch is robust enough for trunk inclusion
    • … so this basically follows the same policy as commit directly on trunk, except when some initial review is wanted and/or a few bugfixes are to be expected
    • typical and first example was WikiContext (see ​trac-dev:1514)
  2. experimental branches:
    • this kind of branch are typically about large changes to some architectural part of Trac, or about a big rework of some subsystem.
    • the process to get such a branch up is a bit more formal: a proposal should be made to the development list, and should get approval from other developers. That initial approval doesn't necessarily mean agreement for a future branch integration, though.
    • before the branch gets merged back into trunk, another round of approval is needed

In order to distinguish between the two kind of branches, a -tmp suffix should be used for the informal, short-lived branches.

Branches Overview

Current branches

sandbox/controller
Controller refactoring
sandbox/setuptools
SetupTools integration
sandbox/sqlalchemy-ng
SqlAlchemy integration, restarted
sandbox/trac-xref
TracCrossReferences
sandbox/announcer
Trac Notification system refactoring

Planned branches

sandbox/mimeview-refactoring
Mimeview refactoring, #3332
sandbox/generic-trac
GenericTrac, milestone refactoring
sandbox/setuptools
TracDev/SecurityBranch (restart on WikiContext) sandbox/vc-refactoring VcRefactoring branch for 0.12 probably

Unfinished Branches

sandbox/workflow@3378

WorkFlow branch for 0.10dev

sandbox/setuptools@3354
TracDev/SecurityBranch for 0.10dev
sandbox/sqlalchemy
SqlAlchemy integration

Completed Branches

sandbox/browser-quickjump@4436
VcRefactoring/BrowserQuickjump
sandbox/webadmin-genshi@
WebAdmin plugin, Genshi version
sandbox/jquery@
Integration of jQuery
sandbox/datetimegenshi@
datetime
sandbox/genshi@
Migration from ClearSilver to Genshi
sandbox/i18n
Localization of Trac
sandbox/unicode@
unicode refactoring
sandbox/wsgi@
WSGI refactoring

Plugins

As of r8950, the plugins have been moved out of the sandbox:

See also: TracDev/Proposals

Last modified 12 years ago Last modified on Mar 7, 2015, 12:00:56 AM
Note: See TracWiki for help on using the wiki.