Skip to content

Commit

Permalink
Merge branch 'db/vcs-svn-incremental' into svn-fe
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jonathan Nieder committed May 26, 2011
2 parents 59445b0 + 43155cf commit 9ecfa8a
Show file tree
Hide file tree
Showing 9 changed files with 422 additions and 413 deletions.
6 changes: 5 additions & 1 deletion contrib/svn-fe/svn-fe.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----------
Expand Down
Loading

0 comments on commit 9ecfa8a

Please sign in to comment.