svn commit woes when merge created a new file

I'm pretty new to SubVersion, so please forgive me if this isn't the
right list to be asking on.

I'm having a problem successfully committing files that were created as
the result of an svn merge.

For example, I have a branch in which I created a new file.
I check out the main trunk, and merge the branch into it. Everything
looks fine, the new files are marked with A + on the log, and svn
status shows them as being new.

However, when I do an svn commit, I'm told that the copy failed because
the file came from a different repo. Now this is just plain not true, I
only have the one repository.

I'm running on WinXP, and all my repository URLs are of the form
file://.

Can anybody shed some light on what is happening please?

Much obliged,

Stony.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 15 22:53:46 2003