From: Daniel Martí <mvdan@mvdan.cc>
Date: Mon, 27 May 2013 13:09:18 +0000 (+0200)
Subject: Add branches to docs, be a bit more specific
X-Git-Tag: 0.1~558^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=55335dc0300c0c530dc4bbf39099739580485cf6;p=fdroidserver.git

Add branches to docs, be a bit more specific
---

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index ab361b74..d898a2f4 100644
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -638,9 +638,14 @@ The git-svn option connects to an SVN repository, and you specify the URL in
 exactly the same way, but git is used as a back-end. This is preferable for
 performance reasons, and also because a local copy of the entire history is
 available in case the upstream repository disappears. (It happens!). In
-order to use Tags as update check mode for this VCS type
-the URL must encode the path to the trunk and tags, like so: 
-http://svn.code.sf.net/p/project/code;trunk=trunk;tags=tags.
+order to use Tags as update check mode for this VCS type, the URL must have
+the tags= special argument set. Likewise, if you intend to use the
+RepoManifest/branch scheme, you would want to specify branches= as well.
+Finally, trunk= can also be added. All these special arguments will be passed
+to "git svn" in order, and their values must be relative paths to the svn repo
+root dir.
+Here's an example of a complex git-svn Repo URL:
+http://svn.code.sf.net/p/project/code/svn;trunk=trunk;tags=tags;branches=branches
 
 For a Subversion repo that requires authentication, you can precede the repo
 URL with username:password@ and those parameters will be passed as @option{--username}