not under version control

svn, version 1.4.2 (r22196)
   compiled Nov 10 2006, 17:39:50

Here's the command that is bothering me:
svn merge
file:///home/subversion/repos/survey/branches/T04405c/web/admin/CookieList.jsp_at_HEAD
file:///home/subversion/repos/survey/trunk/web/admin/CookieList.jsp_at_HEAD
./web/admin/CookieList.jsp

the result is:
svn: Use --force to override this restriction
svn: 'web/admin/CookieList.jsp' is not under version control

branches/T04405c is a branch from the trunk.
CookieList.jsp is a new file in the trunk that I want to merge into the
branch.
the working directory for the above command is the working directory for
the branch.

Why won't it merge? I've tried the --force option but it doesn't
appear to make any difference.

The same format of command works for updates, but fails on new files.

I must be missing something obvious.

-- 
Mitch Claborn
mitch_at_claborn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org