Merge of branch to trunk fails (cvs server: no such file)

[Arcin Bozkurt]

address@hidden mpeg]$ cvs -n update -l -jPrediction-Branch
? DebugFiles
cvs server: Updating .
U API.h
U APISim.cpp
RCS file: /opt/cvsroot/mpeg/ClearBorder.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
Merging differences between 1.2 and 1.2.2.1 into ClearBorder.cpp
cvs server: ClearBorder.cpp: No such file or directory
U API_ID.h

--

Here is the command and the result we get. Although commands like 
update/commit etc work on the trunk and the branch successfully, this does 
not work. 

2)
Shouldn't "-l" limit the operation to the local directory. The API related 
files that you are kept in a subdirectory. Why are they included in the 
operation?

Arcin