svn: Item is out of date

Hello,

I was hoping someone might be able to enlighten me on this problem that
I am having. I am trying to merge a branch into the trunk but when I do
it, I get this message about a file is out of date. Here is what I am
doing to merge the branch (which started at revision 86) into the trunk:

mkdir ~/temp
cd ~/temp
svn checkout -r 86 http://svn.hddbroker.com/repos/intranet/trunk
svn merge --dry-run -r86:HEAD
http://svn.hddbroker.com/repos/intranet/branches/release-1.2.0
svn merge -r86:HEAD
http://svn.hddbroker.com/repos/intranet/branches/release-1.2.0
svn commit -m "Merging the release-1.2.0 branch into the trunk"

No errors occur until I issue the commit command at which point I get
the following error:

Replacing website/mailinglist/sendnewsletter.php
svn: Commit failed (details follow):
svn: Item '/trunk/website/mailinglist/sendnewsletter.php' is out of date

I tried to get the log of the sendnewsletter.php file but I get another
error message:

cd website/mailinglist/
svn log sendnewsletter.php

svn: REPORT request failed on
'/repos/intranet/!svn/bc/0/trunk/website/mailinglist/sendnewsletter.php'
svn:
'/repos/intranet/!svn/bc/0/trunk/website/mailinglist/sendnewsletter.php'
path not found

During my searches of the mailing list someone had a similar error
message and was able to get around it by issuing the svn up command on
the trunk so I tried to do that and go this error message:

svn up

svn: REPORT request failed on '/repos/intranet/!svn/vcc/default'
svn: Working copy path 'sendnewsletter.php' does not exist in repository

I am not exactly sure where to go from here so if someone could advise
me I would really appreciate it. The only thing that I could about that
would make this file any different than any other file I have committed
so far as I believe this file was deleted in the repository and then a
different file with the same filename was added. Not too sure if that
would make a difference or not.

Thanks.

-- 
Richard Morris HDD Broker, Inc. Toll-Free: +1 866 960-3331 
International: +1 250 474-6022 Fax: +1 250 474-6099 E-Mail: 
richard@hddbroker.com Web Site: www.hddbroker.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org