add some additional info on revision control

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@12667 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 39 insertions, 4 deletions

diff --git a/doc/narrative_introduction b/doc/narrative_introduction
index f64098372c..384d02910e 100644
--- a/doc/narrative_introduction
+++ b/doc/narrative_introduction
@@ -54,17 +54,52 @@ subversion so you have the files on your computer and can follow along
 at home. To do this, you need an Alioth account, and then you just
 need to do the following:
 
-svn co svn+ssh://svn.debian.org/svn/secure-testing
+svn co svn+ssh://<alioth user name>@svn.debian.org/svn/secure-testing
 
-This will check out our working repository into a directory called
-secure-testing. Inside this directory are a number of subdirectories.
-The data directory is where we do most of our work. 
+This will check out our working repository after asking for your alioth
+password twice. This is normal and to be expected. After successfully
+downloading, you will have a new directory called secure-testing. Inside
+this directory are a number of subdirectories.  The data directory is
+where we do most of our work.  If you don't have Alioth account, you can
+create one at:
+
+https://alioth.debian.org/account/register.php
 
 If you don't need write access, you can of course check out our files
 without an Alioth account as well:
 
 svn co svn://svn.debian.org/svn/secure-testing
 
+If you are a git fan, you can also use git-svn. Once you have the
+git-svn package installed, you can clone the subversion repository into
+your own local git repository with:
+
+git svn clone svn+ssh://<alioth user account>@svn.debian.org/svn/secure-testing
+
+Note that this will take a very long time (expect over two hours) since
+every commit from the very beginning (over 12,000 at this point) is
+checked out individually and merged into your git repository.
+
+Subversion and git-svn Crash Course
+-----------------------------------
+
+The following table lists the most common/useful commands for working
+with the secure-testing repository:
+
+  subversion       | git-svn           | action
+  -----------------+-------------------+------------------------------
+  svn update       | git svn rebase    | sync your local repo from
+                   |                   | remote secure-testing repo
+  -----------------+-------------------+------------------------------
+  svn commit       | git commit -a     | commit your changes to the
+                   | git svn dcommit   | remote secure-testing repo
+                   |                   | (note that 'git commit -a'
+                   |                   | only updates your local repo)
+  -----------------+-------------------+------------------------------
+  svn diff         | git diff          | compare your local repo to
+                   |                   | remote secure-testing repo
+  -----------------+-------------------+------------------------------
+
 Automatic Issue Updates
 -----------------------
 Twice a day a cronjob runs that pulls down the latest full CVE lists