Changes between Version 1 and Version 2 of BranchPolicy


Ignore:
Timestamp:
09/29/2005 01:37:25 PM (10 years ago)
Author:
adrian
Comment:

Small edits

Legend:

Unmodified
Added
Removed
Modified
  • BranchPolicy

    v1 v2  
    1 == Django's branch policy ==
     1= Django's branch policy =
    22
    3 This page outlines how we use SVN branches for Django development.
     3This page outlines how we use Subversion branches for Django development.
    44
    5 In general, most development should be confined to the trunk, and the trunk should be kept stable.  People should be able to run production sites against trunk at any time.
     5In general, most development should be confined to the trunk, and the trunk should be kept stable. People should be able to run production sites against the trunk at any time.
    66
    7 Thus, large architectural changes -- that is, changes too large to be encapsulated in a single patch, or changes that need multiple eyes on them -- will have branches dedicated to them.  See, for example, the [source:django/branches/i18n i18n branch].  If you have a change of this nature you would like to work on, ask on the django-developers list for a branch to be created for you.
     7Thus, large architectural changes -- that is, changes too large to be encapsulated in a single patch, or changes that need multiple eyes on them -- will have branches dedicated to them. See, for example, the [source:django/branches/i18n i18n branch]. If you have a change of this nature that you'd like to work on, ask on the [http://groups.google.com/group/django-developers django-developers list] for a branch to be created for you.
    88
    9 We will only branch entire copies of the Django tree, even if work is only happening on part of that tree.  This makes switching to a branch painless.
     9We will only branch entire copies of the Django tree, even if work is only happening on part of that tree.  This makes it painless to switch to a branch.
    1010
    11 Developers working on a branch should periodically merge changes from the trunk into the branch (please merge at least once a week).  Every time you merge from the trunk note the merge and revision numbers in the commit message.
     11Developers working on a branch should periodically merge changes from the trunk into the branch. Please merge at least once a week. Every time you merge from the trunk, note the merge and revision numbers in the commit message.
    1212
    13 Once the branch is stable and ready to be merged into the trunk, alert django-developers. 
     13Once the branch is stable and ready to be merged into the trunk, alert the django-developers list.
    1414
    15 After a branch has been merged, it should be considered "dead"; write access to it will be disabled, and old branches will be periodically "trimmed".  To keep our SVN wrangling to a minimum, we won't be merging from a given branch into the trunk more than once.
     15After a branch has been merged, it should be considered "dead"; write access to it will be disabled, and old branches will be periodically "trimmed". To keep our SVN wrangling to a minimum, we won't be merging from a given branch into the trunk more than once.
    1616
    1717=== Using branches ===
    1818
    19 To test a given branch, you can simple check out the entire branch, or if you've got a working directory you'd like to switch to use a branch, you can use
     19To test a given branch, you can simply check out the entire branch. Or, if you've got a working directory you'd like to switch to use a branch, you can use...
    2020
    21 {{{
    22     svn switch http://code.djangoproject.com/svn/django/branches/<branch>/
    23 }}}
     21{{{svn switch http://code.djangoproject.com/svn/django/branches/<branch>/}}}
    2422
    25 in the root of your Django sandbox.
     23...in the root of your Django sandbox.
Back to Top