summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-02-11 23:21:24 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:12 (GMT)
commit97ae091169b233ecd80eb5ef2da80145f8c724f7 (patch)
treeed25348065b861b6be807f85fcb864fd5451d874 /Documentation
parent93f2689ccdf7b62864aac40097bfd51328fae5b7 (diff)
downloadgit-97ae091169b233ecd80eb5ef2da80145f8c724f7.zip
git-97ae091169b233ecd80eb5ef2da80145f8c724f7.tar.gz
git-97ae091169b233ecd80eb5ef2da80145f8c724f7.tar.bz2
git-svn: extra safety for noMetadata and useSvmProps users
Make sure we flush our userspace buffers and and fsync(2) .rev_db information to disk if we use these options because we really don't want to lose this information. Also, disallow --use-svm-props and --no-metadata from the command-line because history will be inconsistent if they're only used occasionally. If a user wants to use these options, they must be set in the config so they're always on. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svn.txt26
1 files changed, 21 insertions, 5 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 50dc6ac..d45283a 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -316,17 +316,33 @@ for more information on using GIT_SVN_ID.
config key: svn.followparent
---no-metadata::
+svn.noMetadata:
+svn-remote.<name>.noMetadata:
This gets rid of the git-svn-id: lines at the end of every commit.
If you lose your .git/svn/git-svn/.rev_db file, git-svn will not
be able to rebuild it and you won't be able to fetch again,
either. This is fine for one-shot imports.
- The 'git-svn log' command will not work on repositories using this,
- either.
-
-config key: svn.nometadata
+ The 'git-svn log' command will not work on repositories using
+ this, either. Using this conflicts with the 'useSvmProps'
+ option for (hopefully) obvious reasons.
+
+svn.useSvmProps:
+svn-remote.<name>.useSvmProps:
+ This allows git-svn to re-map repository URLs and UUIDs from
+ mirrors created using SVN::Mirror (or svk) for metadata.
+
+ If an SVN revision has a property, "svm:headrev", it is likely
+ that the revision was created by SVN::Mirror (also used by SVK).
+ The property contains a repository UUID and a revision. We want
+ to make it look like we are mirroring the original URL, so
+ introduce a helper function that returns the original identity
+ URL and UUID, and use it when generating metadata in commit
+ messages.
+
+ Using this conflicts with the 'noMetadata' option for
+ (hopefully) obvious reasons.
--