Skip to content

Commit 9ecfa8a

Browse files
committed
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
2 parents 59445b0 + 43155cf commit 9ecfa8a

File tree

9 files changed

+422
-413
lines changed

9 files changed

+422
-413
lines changed

contrib/svn-fe/svn-fe.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ svn-fe - convert an SVN "dumpfile" to a fast-import stream
77

88
SYNOPSIS
99
--------
10-
svnadmin dump --incremental REPO | svn-fe [url] | git fast-import
10+
[verse]
11+
mkfifo backchannel &&
12+
svnadmin dump --incremental REPO |
13+
svn-fe [url] 3<backchannel |
14+
git fast-import --cat-blob-fd=3 3>backchannel
1115

1216
DESCRIPTION
1317
-----------

0 commit comments

Comments
 (0)