Re: Merge error (Failed to read tmp.tmp file)

"Shawn Bissell (RezRez)" <shawn.bissell@rezolution.com> writes:
> I'm getting this weird error when trying to merge in changes from a branch
> back into my trunk.
>
> > cd C:\trunk
> > svn merge -r 43:HEAD file:///d:/svn/repos/4.02/
>
> G Source\rminsurancedetail.asp
> G Source\rmInfoVendor.asp
> svn: End of file found
> svn: Failed to read file 'Source/rmBookingFunctions.asp.tmp.tmp'.
>
> It merges all the files fine up to the error, then stops. I did a diff on
> the file and found that it hadn't even changed.

Can you reproduce it every time?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 28 21:58:24 2003