I've encountered what I think is a problem with subversion, but I'm not completely sure (and according to the online instructions I should bring it up here prior to filing a bug).
Basically, we're trying to merge a rather large collection of fixes back in our trunk. I check out a fresh copy of the trunk, then use the merge syntax: svn merge https://path/to/my/branch . This generally churns along just fine, but we occasionally get hung up on medium sized binary files where the svn client jumps to 100% cpu usage and sits on it for 3+ hours before moving on to the next file. These files are anywhere from 3-10MB in size, so not ridiculously huge. We generally have these files marked as octet stream, but changing to text did not help the situation when we tried that. I did find an old forum discussion about a potential issue that could be related. I was wondering if this was ever addressed and could it still be the same problem. Link is here: http://www.svnforum.org/threads/36123-Slow-SVN-merge I'm using svn client 1.6.12. I looked at the online change log up through the 1.7 alphas and didn't see any bug fixes that sounded relevant. Any help is appreciated! I'm sure we're not the only team experiencing this issue. Thanks much, Kyle
