Kyle Leber wrote on Sun, Oct 02, 2011 at 20:05:19 -0400:
> I did a little more digging. There were a few different places where svn
> seems to get hung up so I ran the gprof report on just the first one (the
> merge takes hours otherwise). In this particular case, svn prints out that
> it is merging from a small text file while it is hanging for more than a
> minute @ 100% CPU. When I examine "lsof", however, it see it actually has a
> different file open. This one is a large (15 MB) "binary" file. It turns
> out this binary file did not have a property in the trunk (which I think
> means it's treated as text, right?). But in the branch it was marked as
> octet stream. So perhaps svn is doing a text-based diff on this binary
> file because it used to be incorrectly marked as text?
If either side is marked as binary then svn will defer to the "Use
merge-right if merge-left == base, else conflict" algorithm.
Could you share the value of 'svn proplist --verbose' on both files?
Received on 2011-10-03 02:10:53 CEST