Which version of CVS? I just tried this using 1.10.8 and it
worked fine.
On Thu, Jun 15, 2000 at 01:58:39PM -0400, 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!
>
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. [EMAIL PROTECTED]
| | /
[Microsoft's] www.hotmail.com is running Apache/1.3.6 (Unix) ... on FreeBSD
- Netcraft's "What's that site running?" service, 12-Jun-2000
