> -----Original Message-----
> From: Dmitry Levichev [DLevichev{a}colvir.ru]
> Sent: zaterdag 8 november 2008 14:27
> To: users_at_subversion.tigris.org
> Subject: Out of memory on merge respecting ancestry
>
> Hello!
>
> Please, help me! Our company use Subversion for local project
> containing about 40 000 files and about 10 branches. After some
> successive merges of two branches we have got stable Out of memory
> error on every new merge of these branches.
>
> We can avoid the error using "--ignore-ancestry" parameter, but it
> is not a good solution. If I am not mistaken, svn fails updating
> svn:mergeinfo property, because I can see all changes from merged
> revision in my working copy.
>
> My branches have names "base" and "dev", dev is a copy of base.
> Some revisions (with file moves) were merged from dev back to base
> (let it be revision X), and result of the merge (X) was merged again
> from base to dev. I believe that was a mistake, but now it's too
> late to fix it.
>
> Unfortunately I cannot reproduce error on some small repository.
> Therefore, my question is: how can I get some debug output of merge
> operation? Is it possible to trace svn merge?
>
> Or may be I can fix it another way?
>
> svn, version 1.5.3 (r33570) compiled Oct 9 2008, 09:11:19
> OS: WindowsXP Professional SP2
It won't help you as real solution but there are 64 bit binaries available
of TortoiseSVN and the commandline client (http://sliksvn.com/en/download).
You could use these on a x64 machine to work around the issue until a real
solution is found.
Bert
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-10 12:09:53 CET