git-svn: clarify explanation of --destination argument
The existing documentation for "-d" does not make it obvious whether its argument is supposed to be a full svn path, a partial svn path, the glob from the config file, or what. Clarify the text and add an example to get the reader started. Reported-by: Nathan Gray <n8gray@n8gray.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Jonathan Nieder committed
Dec 19, 2011 at 19:24 UTC
7d82b4af1cefe55b825f524f250cd0002dbba4ab
1 file changed
+14
-5
Documentation/git-svn.txt
+14
-5
@@ -271,13 +271,15 @@ first have already been pushed into SVN.
271
Create a tag by using the tags_subdir instead of the branches_subdir
272
specified during git svn init.
273
274
--d;;
275
---destination;;
274
+-d<path>;;
275
+--destination=<path>;;
276
+
277
If more than one --branches (or --tags) option was given to the 'init'
278
or 'clone' command, you must provide the location of the branch (or
278
- tag) you wish to create in the SVN repository. The value of this
279
- option must match one of the paths specified by a --branches (or
280
- --tags) option. You can see these paths with the commands
279
+ tag) you wish to create in the SVN repository. <path> specifies which
280
+ path to use to create the branch or tag and should match the pattern
281
+ on the left-hand side of one of the configured branches or tags
282
+ refspecs. You can see these refspecs with the commands
283
+
284
git config --get-all svn-remote.<name>.branches
285
git config --get-all svn-remote.<name>.tags
@@ -1044,6 +1046,13 @@ Multiple fetch, branches, and tags keys are supported:
1046
tags = tags/server/*:refs/remotes/project-a/tags/*
1047
------------------------------------------------------------------------
1048
1049
+Creating a branch in such a configuration requires disambiguating which
1050
+location to use using the -d or --destination flag:
1051
+
1052
+------------------------------------------------------------------------
1053
+$ git svn branch -d branches/server release-2-3-0
1054
+------------------------------------------------------------------------
1055
+
1056
Note that git-svn keeps track of the highest revision in which a branch
1057
or tag has appeared. If the subset of branches or tags is changed after
1058
fetching, then .git/svn/.metadata must be manually edited to remove (or