From: Keshav Kini <keshav.kini@gmail.com>
To: git@vger.kernel.org
Cc: Eric Wong <normalperson@yhbt.net>, Keshav Kini <keshav.kini@gmail.com>
Subject: [PATCH v2 4/4] git-svn.txt: elaborate on rev_map files
Date: Sun, 29 Sep 2013 18:46:00 -0500 [thread overview]
Message-ID: <1380498360-18387-5-git-send-email-keshav.kini@gmail.com> (raw)
In-Reply-To: <1380498360-18387-1-git-send-email-keshav.kini@gmail.com>
The man page for `git svn` describes a situation in which "'git svn'
will not be able to rebuild" your $GIT_DIR/svn/**/.rev_map* files, but
no mention is made of in what circumstances `git svn` *will* be able to
do so, how to get `git svn` to do so, or even what these files are.
This patch adds a FILES section to the man page with a description of
what $GIT_DIR/svn/**/.rev_map* files are and how they are (re)built, and
links to this description from various other parts of the man page.
Signed-off-by: Keshav Kini <keshav.kini@gmail.com>
---
Documentation/git-svn.txt | 28 ++++++++++++++++++++++++----
1 file changed, 24 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 3ddf545..5383496 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -106,6 +106,9 @@ COMMANDS
tracking. The name of the [svn-remote "..."] section in the
$GIT_DIR/config file may be specified as an optional
command-line argument.
++
+This automatically updates the rev_map if needed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
--localtime;;
Store Git commit times in the local timezone instead of UTC. This
@@ -201,6 +204,9 @@ accept. However, '--fetch-all' only fetches from the current
+
Like 'git rebase'; this requires that the working tree be clean
and have no uncommitted changes.
++
+This automatically updates the rev_map if needed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
-l;;
--local;;
@@ -449,9 +455,10 @@ Any other arguments are passed directly to 'git log'
file cannot be ignored forever (with --ignore-paths) the only
way to repair the repo is to use 'reset'.
+
-Only the rev_map and refs/remotes/git-svn are changed. Follow 'reset'
-with a 'fetch' and then 'git reset' or 'git rebase' to move local
-branches onto the new tree.
+Only the rev_map and refs/remotes/git-svn are changed (see
+'$GIT_DIR/svn/\*\*/.rev_map.*' in the FILES section below for details).
+Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to
+move local branches onto the new tree.
-r <n>;;
--revision=<n>;;
@@ -684,7 +691,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_DIR/svn/\*\*/.rev_map.* files, 'git svn' will not
+if you lose your '$GIT_DIR/svn/\*\*/.rev_map.*' files, 'git svn' will not
be able to rebuild them.
+
The 'git svn log' command will not work on repositories using
@@ -1063,6 +1070,19 @@ or tag has appeared. If the subset of branches or tags is changed after
fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove
(or reset) branches-maxRev and/or tags-maxRev as appropriate.
+FILES
+-----
+$GIT_DIR/svn/\*\*/.rev_map.*::
+ Mapping between Subversion revision numbers and Git commit
+ names. In a repository where the noMetadata option is not set,
+ this can be rebuilt from the git-svn-id: lines that are at the
+ end of every commit (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.
+
SEE ALSO
--------
linkgit:git-rebase[1]
--
1.8.3.2
next prev parent reply other threads:[~2013-09-29 23:46 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
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 ` Keshav Kini [this message]
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=1380498360-18387-5-git-send-email-keshav.kini@gmail.com \
--to=keshav.kini@gmail.com \
--cc=git@vger.kernel.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.
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).