Bazaar
Sections: Installing the Game | Playing the Game | Competition Hub | Server Administration | Extending Armagetron Advanced | Development Docs
Bazaar (bzr) and how we use it
This is work in progress and has not yet been approved by management. Hold your horses.
What we're doing with it
Our main source repository for long term history and releases still is managed with SVN at SourceForge, but our current development trunk and feature development branches that originate from it (and will be eventually merged back) are managed with Bazaar.
Tools you need
To fetch development branches or the trunk using Bazaar, you need Bazaar. Duh.
To contribute back, we require you "rebase" your work before we integrate it; this makes all integration conflicts happen to you, and not the poor merging operator. You'll need the bzr-rebase plugin for that.
To take over the merging operator duty and manage the two way syncing of the Bazaar branches and SVN, you'll need the bzr-svn plugin and its somewhat difficult dependencies. Difficult unless you run Ubuntu, then you get everything you need apart from the plugin itself. Lucky bastard.
Sections: Installing the Game | Playing the Game | Competition Hub | Server Administration | Extending Armagetron Advanced | Development Docs
