[SVN-3854] Out of memory during merge with many Tree Conflicts

• Type: Bug
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: 1.6.x
• Fix Version/s: 1.7.8
• Component/s: unknown

Environment

Windows XP

• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 14/Apr/11 09:40
• Updated: 27/Oct/18 16:28
• Resolved: 09/Jan/13 17:32

Description

When merging between two branches that have many Tree Conflicts (hundreds), 
there seems to be a memory leak as both svn client and TortoiseSVN often fail 
with an out of memory (at the 2G system limit it seems).

I've been working around it by merging directory by directory (very tedious), 
but this also exhibits the rapid ramp-up of memory usage ~2 M/sec, occasionally 
resulting in the out of memory issue. Interestingly, re-running the merge is 
sometimes successful.   

While trying to work around this error. I've upgraded to 1.6.16.

This problem seems similar to #3393.

Original issue reported by awltux