Context Navigation

Mercurial Branches

This page documents how to use Mercurial, rather than Subversion, to hack on Django. See also DjangoBranches.

Core developers

For people who are core committers, and want to use Mercurial rather than Subversion as their client:

Install the ​hgsubversion extension (and understand basically how it works).

Clone the Subversion repository (do this using hg version 1.5 or higher, or else the changeset hashes generated by hgsubversion will be incompatible with those from repos generated using newer hg versions, including the ​official Django hg mirror).:

hg clone svn+http://code.djangoproject.com/svn/django/ django

This will take a Good While (lots of hours), and in some cases can take a Very Long Time for just one changeset (I gave up on r11505).
ALTERNATIVELY:

Do hg svn rebuildmeta. This works because the official Django mirror was created by hgsubversion, and is updated only by hgsubversion.

Use normal hg commands to make commits, switch branches, push back to the subversion repository etc. Remember to use hg rebase --svn, and not hg merge.

Tips

Use the ​bookmarks extension for git-style local feature branches, or named branches for feature branches that you need other people to see.

Alternatively, use the ​queues extension to manage long lived patches.

To collapse several commits into a single commit before pushing back to svn, use the ​histedit extension

Backporting

To backport a changeset from trunk, use the ​transplant extension. From Mercurial 1.9 onwards, you can use the 'filter' feature of transplant to create the commit message for you. Save the following script as ~/bin/django_backport_filter (for example) and make it executable:

(Older revisions of this wiki page have methods that work for older versions of Mercurial, but they are suboptimal - upgrading hg is preferred).

Gotchas

If you make two commits, and only want to push the first, you will have some trouble, since the HgSubversion extensions doesn't support specifying revisions with the hg push command when pushing to a Subversion repository. Nice solutions to this welcome!