We just experienced that same problem here. I haven't had a chance to investigate the
cause.
One way to work around the problem is to put the ",v" file in the repository into the
Attic.
Shane
"Kevin C. Castner" wrote:
> I have files that were created on a branch
>
> (Create the file)
> cvs co -r branch_name doc
> cd doc
> touch index.htm
> cvs add index.htm
> cvs commit index.htm
>
> Now I try to merge the file back to the main trunk.
>
> cd ..
> rm -rf doc
> cvs co doc
> cd doc
> cvs update -j branch_name
> cvs commit index.htm
>
> CVS then gives me the following error:
>
> cvs server: cannot add file `index.htm' when RCS file
>`/export/home/cvs/netops/doc/index.htm,v' already exists
> cvs [server aborted]: correct above errors first!
>
> Thanks
>
> Kevin
