diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 01:51:38 -0500 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-05-26 02:02:44 -0500 |
| commit | 9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e (patch) | |
| tree | 0eb9fa67421fe2c89f1262a2c92de01f4e042729 /vcs-svn/repo_tree.h | |
| parent | 59445b0b02c731872c8665ac7e9cf1226fa616e4 (diff) | |
| parent | 43155cfe1415f5547791613a5de6399112ba3560 (diff) | |
| download | git-9ecfa8ae4c6701cae85c4f22fdfacffe22d8a75e.tar.gz | |
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 'vcs-svn/repo_tree.h')
| -rw-r--r-- | vcs-svn/repo_tree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h index 37bde2e374..ce69fa7e58 100644 --- a/vcs-svn/repo_tree.h +++ b/vcs-svn/repo_tree.h @@ -14,8 +14,7 @@ struct strbuf; uint32_t next_blob_mark(void); void repo_copy(uint32_t revision, const uint32_t *src, const uint32_t *dst); void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark); -uint32_t repo_read_path(const uint32_t *path); -uint32_t repo_read_mode(const uint32_t *path); +const char *repo_read_path(const uint32_t *path, uint32_t *mode_out); void repo_delete(uint32_t *path); void repo_commit(uint32_t revision, const char *author, const struct strbuf *log, const char *uuid, const char *url, |