Code


Version 3 (modified by lukeplant, 4 years ago) (diff)

--

Mercurial Branches

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

Core developers

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

  1. Install the hgsubversion extension (and understand basically how it works).
  2. Clone the Subversion repository:
    hg clone svn+http://code.djangoproject.com/svn/django/ django
    
    This will take a while.
  3. 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.
  • 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
  • To backport a changeset from trunk, use the transplant extension