I'm using svn-0.32.1 which is based on revision 7480 which doesn't have the
memory overwrite change in 7523.
I tried doing it over http and got the exact same result.
trunk>svn merge -r 43:HEAD http://server/svn/repos/4.02/
svn: End of file found
svn: Failed to read file 'Source/rmBookingFunctions.asp.tmp.tmp'.
The two consecutive merges didn't work either.
I actually worked around the issue by removing the file in my working copy,
then doing the merge then moving the file back. So its not a high priority
issue or anything ... I'd just like to why it did that. I'm wondering if
it's the actual file contents that crashed the diff algorithm or something
weird like that?
> It may be a coincidence, but I got the same error while investigating
> what proved to be a memory overwrite in the fs node cache. In my case
> I was running
>
> svn diff -r117:188 file://`pwd`/empty-space
>
> which uses much of the same code as merge. Once I fixed the fs memory
> overwrite (in revision 7523) the problem went away.
>
> You don't say which version of Subversion you are using, but if it is
> one of the releases then you won't have the 7523 fix. If you are
> seeing an effect of the memory overwrite then changing the command
> might help, you could try svn:// or http://, or try two consecutive
> merges using -r43:X -rX:HEAD.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 29 01:55:06 2003