From: Jonathan Nieder <jrnieder@gmail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: Nathan Gray <n8gray@n8gray.org>, git@vger.kernel.org
Subject: [PATCH 2/2] git-svn: clarify explanation of --destination argument
Date: Mon, 13 May 2013 14:32:34 -0700 [thread overview]
Message-ID: <20130513213234.GG3657@google.com> (raw)
In-Reply-To: <20130513213055.GE3657@google.com>
Date: Mon, 19 Dec 2011 19:24:30 -0600
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>
---
Thanks for reading.
Documentation/git-svn.txt | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 6c0988e..68c706d 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -271,13 +271,15 @@ first have already been pushed into SVN.
Create a tag by using the tags_subdir instead of the branches_subdir
specified during git svn init.
--d;;
---destination;;
+-d<path>;;
+--destination=<path>;;
+
If more than one --branches (or --tags) option was given to the 'init'
or 'clone' command, you must provide the location of the branch (or
- tag) you wish to create in the SVN repository. The value of this
- option must match one of the paths specified by a --branches (or
- --tags) option. You can see these paths with the commands
+ tag) you wish to create in the SVN repository. <path> specifies which
+ path to use to create the branch or tag and should match the pattern
+ on the left-hand side of one of the configured branches or tags
+ refspecs. You can see these refspecs with the commands
+
git config --get-all svn-remote.<name>.branches
git config --get-all svn-remote.<name>.tags
@@ -1044,6 +1046,13 @@ Multiple fetch, branches, and tags keys are supported:
tags = tags/server/*:refs/remotes/project-a/tags/*
------------------------------------------------------------------------
+Creating a branch in such a configuration requires disambiguating which
+location to use using the -d or --destination flag:
+
+------------------------------------------------------------------------
+$ git svn branch -d branches/server release-2-3-0
+------------------------------------------------------------------------
+
Note that git-svn keeps track of the highest revision in which a branch
or tag has appeared. If the subset of branches or tags is changed after
fetching, then .git/svn/.metadata must be manually edited to remove (or
--
1.8.3.rc1
next prev parent reply other threads:[~2013-05-13 21:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-16 19:51 git-svn: multiple fetch lines Nathan Gray
2011-12-17 10:05 ` Jonathan Nieder
2011-12-19 21:40 ` Nathan Gray
2011-12-20 1:22 ` [RFC/PATCH 0/2] " Jonathan Nieder
2011-12-20 1:23 ` [PATCH 1/2] git-svn: multiple fetch/branches/tags keys are supported Jonathan Nieder
2011-12-20 6:42 ` Nathan Gray
2011-12-20 1:24 ` [PATCH 2/2] git-svn: clarify explanation of --destination argument Jonathan Nieder
2013-05-13 21:30 ` [PATCH resend 0/2] git-svn: improve documentation of multiple fetch lines Jonathan Nieder
2013-05-13 21:31 ` [PATCH 1/2] git-svn: multiple fetch/branches/tags keys are supported Jonathan Nieder
2013-05-13 21:32 ` Jonathan Nieder [this message]
2013-05-15 2:00 ` [PATCH resend 0/2] git-svn: improve documentation of multiple fetch lines Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130513213234.GG3657@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=n8gray@n8gray.org \
--cc=normalperson@yhbt.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).