strange issue with a merge

I merged my development branch into the main trunk and I'm getting an
error when trying to commit to the trunk that I don't understand (I
suppose I could delete and re-add but I would like to know that I can
solve this issue)...

The error message is...

Commit failed (details follow):
'/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src' is not under version control and is not part of the commit, yet its child '/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src/M000012.html' is part of the commit

everything under
the /home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/
tree was added in commit #171

if I do (from command line)...
svn add \
/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src
svn: warning:
'/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src' is already under version control

90% of the commit worked but now I'm down to the last 10%

-- 
Craig White <craig@tobyhouse.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org