From: Jonathan Nieder <jrnieder@gmail.com>
To: Keshav Kini <keshav.kini@gmail.com>
Cc: git@vger.kernel.org, Eric Wong <normalperson@yhbt.net>
Subject: Re: [PATCH] git-svn.txt: mention how to rebuild rev_map files
Date: Wed, 25 Sep 2013 12:44:03 -0700 [thread overview]
Message-ID: <20130925194402.GA9464@google.com> (raw)
In-Reply-To: <1379971145-8971-1-git-send-email-keshav.kini@gmail.com>
Hi,
Keshav Kini wrote:
> The man page for `git svn` describes a situation in which "'git svn'
> will not be able to rebuild" your .git/svn/**/.rev_map files, but no
> mention is made of in what circumstances `git svn` *will* be able to do
> so, or how to get `git svn` to do so.
>
> This patch adds some language to the description of the 'fetch' command
> to rectify this oversight, and also fixes an AsciiDoc escaping typo.
>
> Signed-off-by: Keshav Kini <keshav.kini@gmail.com>
Good idea.
[...]
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -103,9 +103,12 @@ COMMANDS
>
> 'fetch'::
> Fetch unfetched revisions from the Subversion remote we are
> - tracking. The name of the [svn-remote "..."] section in the
> - .git/config file may be specified as an optional command-line
> - argument.
> + tracking. If necessary, rebuild the .git/svn/\*\*/.rev_map.*
> + files, given the requisite information exists in commit
> + messages (see the svn.noMetadata config option for more
> + information). The name of the [svn-remote "..."] section in
> + the .git/config file may be specified as an optional
> + command-line argument.
Taking a step back, the reader might wonder *why* he would want
to run "git svn fetch" to rebuilt these .rev_map.* files, and what
they are for.
Perhaps there should be a separate REVISION MAP section describing
this in more detail. Something as simple as
FILES
-----
.git/svn/\*\*/.rev_map.\*::
Mapping between Subversion revision numbers and Git
commit names. Can be rebuilt using the git-svn-id:
lines at the end of every commit as long as the
noMetadata option is not set (see the 'svn.noMetadata'
section above for details).
+
'git svn fetch' and 'git svn rebase' automatically update
the rev_map if it is missing or not up to date. 'git svn
reset' automatically rewinds it.
Then this reference in 'fetch' could just say something like
...
argument.
+
This automatically updates the rev_map if needed (see
'.git/svn/\*\*/.rev_map.\*' in the FILES section below for
details).
> @@ -684,7 +687,7 @@ svn-remote.<name>.noMetadata::
> +
> This option can only be used for one-shot imports as 'git svn'
> will not be able to fetch again without metadata. Additionally,
> -if you lose your .git/svn/**/.rev_map.* files, 'git svn' will not
> +if you lose your .git/svn/\*\*/.rev_map.* files, 'git svn' will not
I don't mind seeing this fix snuck into the same commit, but a
separate commit that could be applied more quickly would be even
better. ;-)
Thanks and hope that helps,
Jonathan
next prev parent reply other threads:[~2013-09-25 19:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-23 21:19 [PATCH] git-svn.txt: mention how to rebuild rev_map files Keshav Kini
2013-09-25 19:44 ` Jonathan Nieder [this message]
2013-09-25 19:47 ` Eric Wong
2013-09-25 23:37 ` Keshav Kini
2013-09-26 0:06 ` Jonathan Nieder
2013-09-26 2:21 ` Keshav Kini
2013-09-26 2:41 ` Keshav Kini
2013-09-29 23:45 ` [PATCH v2 0/4] git-svn.txt: miscellaneous changes Keshav Kini
2013-09-29 23:45 ` [PATCH v2 1/4] git-svn.txt: fix AsciiDoc formatting error Keshav Kini
2013-09-29 23:45 ` [PATCH v2 2/4] git-svn.txt: reword description of gc command Keshav Kini
2013-09-29 23:45 ` [PATCH v2 3/4] git-svn.txt: replace .git with $GIT_DIR Keshav Kini
2013-09-29 23:46 ` [PATCH v2 4/4] git-svn.txt: elaborate on rev_map files Keshav Kini
2013-09-30 19:24 ` [PATCH v2 0/4] git-svn.txt: miscellaneous changes Jonathan Nieder
2013-10-10 6:59 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130925194402.GA9464@google.com \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=keshav.kini@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).