summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-05-26 06:51:38 (GMT)
committerJonathan Nieder <jrnieder@gmail.com>2011-05-26 07:02:44 (GMT)
commit9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e (patch)
tree0eb9fa67421fe2c89f1262a2c92de01f4e042729 /contrib
parent59445b0b02c731872c8665ac7e9cf1226fa616e4 (diff)
parent43155cfe1415f5547791613a5de6399112ba3560 (diff)
downloadgit-9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e.zip
git-9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e.tar.gz
git-9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e.tar.bz2
Merge branch 'db/vcs-svn-incremental' into svn-fe
This teaches svn-fe to incrementally import into an existing repository (at last!) at the expense of less convenient UI. Think of it as growing pains. This opens the door to many excellent things, and it would be a bad idea to discourage people from building on it for much longer. * db/vcs-svn-incremental: vcs-svn: avoid using ls command twice vcs-svn: use mark from previous import for parent commit vcs-svn: handle filenames with dq correctly vcs-svn: quote paths correctly for ls command vcs-svn: eliminate repo_tree structure vcs-svn: add a comment before each commit vcs-svn: save marks for imported commits vcs-svn: use higher mark numbers for blobs vcs-svn: set up channel to read fast-import cat-blob response Conflicts: t/t9010-svn-fe.sh vcs-svn/fast_export.c vcs-svn/fast_export.h vcs-svn/repo_tree.c vcs-svn/svndump.c
Diffstat (limited to 'contrib')
-rw-r--r--contrib/svn-fe/svn-fe.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index cd075b9..85f7b83 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/contrib/svn-fe/svn-fe.txt
@@ -7,7 +7,11 @@ svn-fe - convert an SVN "dumpfile" to a fast-import stream
SYNOPSIS
--------
-svnadmin dump --incremental REPO | svn-fe [url] | git fast-import
+[verse]
+mkfifo backchannel &&
+svnadmin dump --incremental REPO |
+ svn-fe [url] 3<backchannel |
+ git fast-import --cat-blob-fd=3 3>backchannel
DESCRIPTION
-----------