Context Navigation

GeoDjango 1.1

This document is to outline the roadmap for the features and fixes that will go into GeoDjango as a part of the 1.1 release. This is meant to be a living document, so feel free to edit -- but please no vandalization or flaming.

Process

All development will be taking place in the gis-1.1 repository hosted at the ​GeoDjango Mercurial page. The gis-1.1 repository is synchronized with SVN trunk, as well as, Russell Keith Magee's ​aggregation git repository, and may also include various patches from tickets before they are checked into trunk (e.g., for SpatiaLite support). Because of the dynamic nature of this repository, it is not recommended for production use.

If the work is already part of a ticket then attach subversion patches as normal to the ticket. However, if the work is:

Then send me (jbronn at gmail) patches directly, and I'll incorporate in the mercurial. All the necessary information for working with the mercurial may be found in the next section.

Informal discussion will take place on IRC (in the #geodjango channel on FreeNode network), and more lengthy discussion (like any feature proposals) should take place on the newly created ​GeoDjango mailing list.

Mercurial Intro

Fortunately, you will only need to learn a subset of Mercurial's features to participate -- and most of them are very similar to what you would do in SVN. This section is a brief guide of the mercurial commands you'll need to work with the gis-1.1 repository.

Installation

Getting a Copy

Here's how to get a copy of the repository -- unlike SVN, you get every changeset when you "clone" a repository:

$ hg clone http://geodjango.org/hg/gis-1.1/

Making Patches

After cloning, work with the code as necessary. Once modified, you create a patch as follows:

$ hg diff > my_patch.diff

However, if you've made your own changes (e.g., checked in your own local revisions with hg ci) then you will need to send me a diff to the latest pulled revision from the repository. In other words, something like:

$ hg diff -r 49

Updating (Pulling)

To get the latest changes (analagous to svn update), you pull the new changesets and then update the repository with the following commands: