[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge error (Failed to read tmp.tmp file)

From: Shawn Bissell (RezRez) <shawn.bissell_at_rezolution.com>
Date: 2003-10-28 20:53:08 CET

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.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 28 20:56:41 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.