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
   

-- 
Best regards,
 Dmitry                          mailto:DLevichev_at_colvir.ru
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org