[Subclipse-users] SVN cannot automatically merge file tempfile.tmp

I have a fresh checkout of the trunk of my project's code. I am attempting to merge a range of revisions from a branch of this code in the repository. Whenever I try this I always receive this error message:

"
SVN cannot automatically merge file tempfile.tmp

Resource: .svn/tmp/tempfile.tmp
"

Whatever option I select, i.e. mark as conflict, accept theirs/mine, it will always then cause the merge process to hang. What's causing this problem and what is the solution? I'm having to merge this code via the command line now, which works perfectly, and it's making me lose faith in Subclipse's ability to manage my version control, as well as wasting a lot of my time.

Cheers,
Ross

--
Ross Collins
http://www.roe.ac.uk/~rsc
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2638911
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].