Nathan Sharp wrote:
> I am about 2 days old to subversion, I wasn't even aware that there
> was a branch with anything I might be interested in. As Donald said,
> yes, I am using the trunk.
> I experimented further (thanks to some help I got on the IRC channel)
> and think I have a workaround now. After running passes 1-3 (and
> forcibly preventing 4 from running), I took the cvs2svn-data.s-revs
> file and chopped it into files with 20,000 lines each. By running the
> script on pass 4 on each file in order, I seem to be able to run
> successfully, which proves that the problem a) is a memory leak and b)
> was failing because it ran my system out of memory. The only negative
> effect of what I did is that right where I split the files (since I
> just did exactly 20k line files and didn't manually split the files up
> at a natural commit break) I will end up with an commit which is split
> in 2, which is minor enough for me not to worry about it.
> The general belief I heard on the IRC channel is that the memory leak
> is probably in the swig bindings and not in the cvs2svn.py script
> itself. I'd be happy to help in any way possible if someone wants to
> try and fix it.
>
Please try the following patch to subversion.
Index: subversion/libsvn_fs/bdb/nodes-table.c
===================================================================
--- subversion/libsvn_fs/bdb/nodes-table.c (revision 4167)
+++ subversion/libsvn_fs/bdb/nodes-table.c (working copy)
@@ -146,6 +146,7 @@
"successor id `%s' (for `%s') already exists in filesystem %s",
new_id_str->data, id_str->data, fs->path);
}
+ if (err) svn_error_clear(err);
/* Return the new node revision ID. */
*successor_p = new_id;
If you can, please also test /branches/cvs2svn-mmacek from subversion
repository (it has some bugfixes in addition to basic branch and tag
conversion support)
MArk
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 22 20:49:19 2002