Django

Code

Changeset 1762

Show
Ignore:
Timestamp:
12/20/05 23:47:17 (3 years ago)
Author:
adrian
Message:

Added clarification to 'Using branches' in docs/contributing.txt

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/docs/contributing.txt

    r1761 r1762  
    224224-------------- 
    225225 
    226 To test a given branch, you can simply check out the entire branch. Or, if 
    227 you've got a working directory you'd like to switch to use a branch, you can 
    228 use:: 
     226To test a given branch, you can simply check out the entire branch, like so:: 
     227 
     228    svn co http://code.djangoproject.com/svn/django/branches/<branch>/ 
     229 
     230Or, if you've got a working directory you'd like to switch to use a branch, 
     231you can use:: 
    229232 
    230233    svn switch http://code.djangoproject.com/svn/django/branches/<branch>/ 
    …… 
    232235...in the root of your Django sandbox (the directory that contains ``django``, 
    233236``docs``, and ``tests``). 
     237 
     238The advantage of using ``svn switch`` instead of ``svn co`` is that the 
     239``switch`` command retains any changes you might have made to your local copy 
     240of the code. It attempts to merge those changes into the "switched" code. 
    234241 
    235242Official releases