file already exists error

hi,
i get this error when i'm trying to commit to a "feature branch" updates from the trunk.

here's what happened:
i merged into my working copy of the branch changes from the trunk. among the changes were new files, so these files where copied to my working copy. but TSVN didn't put the plus sign on the new files (i tried to refresh the windows explorer). so i marked the files for addition manually. btw, when i right clicked the files to add them, the context menu was minimal, like you'll get when right clicking an unversioned file.
after resolving all conflicts, i tried to commit the changes to my branch, but i got the message: file already exists: filesystem 'D:/SVN/db', transaction '132-1', path '/<path to my file>'
the <path to my file> is the supposed path to the file in the repository that's already exists. needless to say, the new files do not exists in my branch, with any sort of capitalization.

i also did svnadmin verify, and came out clean.

thanks,
tsahi

--
The day Micro$oft sells something that doesn't SUCK
is the day they start selling vacuum cleaners.
http://www.geocities.com/tsahi_75
      ____________________________________________________________________________________
Be a better friend, newshound, and 
know-it-all with Yahoo! Mobile.  Try it now.  http://mobile.yahoo.com/;_ylt=Ahu06i62sR8HDtDypao8Wcj9tAcJ 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org