Code

Ticket #16209: 19209_alt_repos.diff

File 19209_alt_repos.diff, 2.0 KB (added by ShawnMilo, 3 years ago)

Patch to mention git & hg as alternatives to svn when "tracking trunk."

Line 
1diff --git AUTHORS AUTHORS
2index b8c773b..4b64f4b 100644
3--- AUTHORS
4+++ AUTHORS
5@@ -351,6 +351,7 @@ answer newbie questions, and generally made Django that much better:
6     Christian Metts
7     michal@plovarna.cz
8     Slawek Mikula <slawek dot mikula at gmail dot com>
9+    Shawn Milochik <shawn@milochik.com>
10     mitakummaa@gmail.com
11     mmarshall
12     Andreas Mock <andreas.mock@web.de>
13diff --git docs/topics/install.txt docs/topics/install.txt
14index 46d6615..0372a51 100644
15--- docs/topics/install.txt
16+++ docs/topics/install.txt
17@@ -234,16 +234,23 @@ Installing the development version
18 If you'd like to be able to update your Django code occasionally with the
19 latest bug fixes and improvements, follow these instructions:
20 
21-1. Make sure that you have Subversion_ installed, and that you can run its
22-   commands from a shell. (Enter ``svn help`` at a shell prompt to test
23-   this.)
24+1. Make sure that you have Subversion_, Git_, or Mercurial_ installed, and
25+   that you can run its commands from a shell. (Enter ``svn help``,
26+   ``git help``, or ``hg help`` at a shell prompt to test this.)
27 
28 2. Check out Django's main development branch (the 'trunk') like so:
29 
30    .. code-block:: bash
31 
32+       #subversion
33        svn co http://code.djangoproject.com/svn/django/trunk/ django-trunk
34 
35+       #git
36+       git clone https://github.com/django/django.git
37+
38+       #mercurial
39+       hg clone https://bitbucket.org/django/django
40+
41 3. Next, make sure that the Python interpreter can load Django's code. The most
42    convenient way to do this is to `modify Python's search path`_. Add a ``.pth``
43    file containing the full path to the ``django-trunk`` directory to your
44@@ -286,4 +293,6 @@ this, Subversion will automatically download any changes.
45 
46 .. _`download page`: http://www.djangoproject.com/download/
47 .. _Subversion: http://subversion.tigris.org/
48+.. _Git: http://git-scm.com/
49+.. _Mercurial: http://mercurial.selenic.com/
50 .. _`modify Python's search path`: http://docs.python.org/install/index.html#modifying-python-s-search-path