Changes between Version 53 and Version 54 of DjangoBranches


Ignore:
Timestamp:
06/16/12 06:47:06 (3 years ago)
Author:
lukeplant
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DjangoBranches

    v53 v54  
    11= Branches =
    22
    3 Development of major new features for Django tends to take place in ''branches'' — copies of the main codebase focused on a particular feature.  Using branches makes it easier to experiment with such sweeping changes without possibly breaking the ''trunk'' — the main line of development.
     3Development of major new features for Django tends to take place in ''branches'' — copies of the main codebase focused on a particular feature.  Using branches makes it easier to experiment with such sweeping changes without possibly breaking ''master'' — the main line of development.
    44
    55Branches may not be stable, but they offer a chance to test out bleeding-edge code before it hits the mainline.  Give them a try, and remember to send feedback to the branch maintainers!
    66
    7 [[PageOutline(2,, inline)]]
     7Since the move to Git, small features can also be developed in ad-hoc 'topic branches'. See https://docs.djangoproject.com/en/dev/internals/contributing/writing-code/working-with-git/ for more.
    88
    9 == Active Branches ==
    109
    11  * A list of all branches, active and inactive, can be found here: http://code.djangoproject.com/browser/django/branches?order=name
    12 
    13 == Creating New Branches ==
    14 
    15 Please see http://docs.djangoproject.com/en/dev/internals/contributing/#branch-policy for information about creating new feature branches.
    16 
    17 == DVCS mirrors ==
    18 
    19 If you have a branch of Django maintained with a DVCS tool, please add it below.
    20 
    21 === Bazaar ===
    22 
    23 [https://launchpad.net/ Launchpad] mirrors Django's trunk: https://launchpad.net/django
    24 
    25 You can fetch it with:
    26 {{{
    27 bzr branch lp:django
    28 }}}
    29 
    30 === Git ===
    31 
    32 There are several git repositories out there, some of which are used to develop patches that will come to SVN.
    33 
    34  * The '''official git mirror''' is maintained by Jannis Leidel, updated every five minutes and hosted on !GitHub: [http://github.com/django/django/]
    35  * Matthias Kestenholz has set up several git repositories for Django and for a selection of Django applications:
    36    * Gitweb with complete list of repositories: http://spinlock.ch/pub/git/ (as of 2010-10-11 http protocol works , git protocol is broken)
    37  * Other people also published their repositories, in case you want to add them as remotes:
    38    * brosner: git://github.com/brosner/django.git [http://github.com/brosner/django/tree/master (browse)]
    39    * Marc Fargas (telenieko): git://www.marcfargas.com/django.git/ [http://www.marcfargas.com/gitweb/?p=django.git;a=summary (browse)]
    40    * Alex Gaynor: http://github.com/alex/django/tree/master
    41 
    42 === Mercurial (hg) ===
    43 
    44  * '''Official mirror''': It's hosted on [http://bitbucket.org Bitbucket], it is updated every five minutes: http://bitbucket.org/django/django ('''warning''' This one is currently broken and is not updated anymore since the move to git)
    45 * '''Unofficial mirror''': It's not an official one, but it is maintained, and follows the git repository. http://bitbucket.org/orzel/django
    46 * See MercurialBranches for how to use hg with Django
    47 
    48 Other repositories
    49 
    50  * [http://geodjango.org/hg/ GeoDjango Mercurial]: includes `gis-newforms` (a merge of the `gis` and `newforms-admin` branches), example code, and other geospatial goodies.
    51  * [http://joelia.gthc.org/django-bugfixes/ DjangoBugfixes]: An experimental MQ repository following the trunk branch of Django. More info is available [http://gthc.org/wiki/PythonWebDevelopment/DjangoBugfixes here].
     10See DvcsMirrors for info about using other version control systems.
Back to Top