summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-12-21 05:47:17 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-12-21 05:47:17 +0000
commitc4b543ff4619f4a643ff5b8df341f525e73b586b (patch)
treeef2a08ad9f9eb263052469bfb7287504e6523391
parent7ce1d7d0986bbf2cd7a9570b227708d1c7697968 (diff)
Added clarification to 'Using branches' in docs/contributing.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/contributing.txt13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/contributing.txt b/docs/contributing.txt
index 26d64845f5..42592fb336 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -223,15 +223,22 @@ trunk more than once.
Using branches
--------------
-To 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::
+To test a given branch, you can simply check out the entire branch, like so::
+
+ svn co http://code.djangoproject.com/svn/django/branches/<branch>/
+
+Or, if you've got a working directory you'd like to switch to use a branch,
+you can use::
svn switch http://code.djangoproject.com/svn/django/branches/<branch>/
...in the root of your Django sandbox (the directory that contains ``django``,
``docs``, and ``tests``).
+The advantage of using ``svn switch`` instead of ``svn co`` is that the
+``switch`` command retains any changes you might have made to your local copy
+of the code. It attempts to merge those changes into the "switched" code.
+
Official releases
=================