summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2010-12-10 04:21:35 -0600
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-03-07 01:43:57 -0600
commitd38f84484f21e7e509ff009d3a17167c9c09f893 (patch)
tree545d72779c2b43b6e600d49334ff03421f8c296f
parentvcs-svn: set up channel to read fast-import cat-blob response (diff)
downloadtgif-d38f84484f21e7e509ff009d3a17167c9c09f893.tar.xz
vcs-svn: use higher mark numbers for blobs
Prepare to use mark :5 for the commit corresponding to r5 (and so on). 1 billion seems sufficiently high for blob marks to avoid conflicting with rev marks, while still leaving room for 3 billion blobs. Such high mark numbers cause trouble with ancient fast-import versions, but this topic cannot support git fast-import versions before 1.7.4 (which introduces the cat-blob command) anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
-rw-r--r--vcs-svn/repo_tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index 14bcc192b6..036a6866b9 100644
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -292,7 +292,7 @@ void repo_commit(uint32_t revision, uint32_t author, char *log, uint32_t uuid,
static void mark_init(void)
{
uint32_t i;
- mark = 0;
+ mark = 1024 * 1024 * 1024;
for (i = 0; i < dent_pool.size; i++)
if (!repo_dirent_is_dir(dent_pointer(i)) &&
dent_pointer(i)->content_offset > mark)