Merge branch 'db/vcs-svn-incremental' into svn-fe
commit9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 26 May 2011 06:51:38 +0000 (26 01:51 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Thu, 26 May 2011 07:02:44 +0000 (26 02:02 -0500)
tree0eb9fa67421fe2c89f1262a2c92de01f4e042729
parent59445b0b02c731872c8665ac7e9cf1226fa616e4
parent43155cfe1415f5547791613a5de6399112ba3560
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
t/t9010-svn-fe.sh
vcs-svn/fast_export.c
vcs-svn/fast_export.h
vcs-svn/repo_tree.h
vcs-svn/string_pool.c
vcs-svn/svndump.c